void M_ConfigureNetSubsystem(void);
// Nehahra
-int NumberOfDemos;
+#define NumberOfNehahraDemos 34
typedef struct
{
- char name[50];
- char desc[50];
-} demonames_t;
-
-demonames_t Demos[35];
+ char *name;
+ char *desc;
+} nehahrademonames_t;
+
+nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
+{
+ {"intro", "Prologue"},
+ {"genf", "The Beginning"},
+ {"genlab", "A Doomed Project"},
+ {"nehcre", "The New Recruits"},
+ {"maxneh", "Breakthrough"},
+ {"maxchar", "Renewal and Duty"},
+ {"crisis", "Worlds Collide"},
+ {"postcris", "Darkening Skies"},
+ {"hearing", "The Hearing"},
+ {"getjack", "On a Mexican Radio"},
+ {"prelude", "Honor and Justice"},
+ {"abase", "A Message Sent"},
+ {"effect", "The Other Side"},
+ {"uhoh", "Missing in Action"},
+ {"prepare", "The Response"},
+ {"vision", "Farsighted Eyes"},
+ {"maxturns", "Enter the Immortal"},
+ {"backlot", "Separate Ways"},
+ {"maxside", "The Ancient Runes"},
+ {"counter", "The New Initiative"},
+ {"warprep", "Ghosts to the World"},
+ {"counter1", "A Fate Worse Than Death"},
+ {"counter2", "Friendly Fire"},
+ {"counter3", "Minor Setback"},
+ {"madmax", "Scores to Settle"},
+ {"quake", "One Man"},
+ {"cthmm", "Shattered Masks"},
+ {"shades", "Deal with the Dead"},
+ {"gophil", "An Unlikely Hero"},
+ {"cstrike", "War in Hell"},
+ {"shubset", "The Conspiracy"},
+ {"shubdie", "Even Death May Die"},
+ {"newranks", "An Empty Throne"},
+ {"seal", "The Seal is Broken"}
+};
float menu_x, menu_y, menu_width, menu_height;
menu_height = 200;
menu_x = (vid.conwidth - menu_width) * 0.5;
menu_y = (vid.conheight - menu_height) * 0.5;
- DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+ //DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0);
}
/*
DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
}
+void M_ItemPrint (float cx, float cy, char *str, int unghosted)
+{
+ /*
+ while (*str)
+ {
+ M_DrawCharacter (cx, cy, (*str++)+128);
+ cx += 8;
+ }
+ */
+ if (unghosted)
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0);
+ else
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0);
+}
+
void M_DrawPic (float cx, float cy, char *picname)
{
DrawQ_Pic (menu_x + cx, menu_y + cy, picname, 0, 0, 1, 1, 1, 1, 0);
}
-byte identityTable[256];
-byte translationTable[256];
+qbyte identityTable[256];
+qbyte translationTable[256];
void M_BuildTranslationTable(int top, int bottom)
{
- int j;
- byte *dest, *source;
+ int j;
+ qbyte *dest, *source;
for (j = 0; j < 256; j++)
identityTable[j] = j;
{
int i;
- for (i=0; i < NumberOfDemos; i++)
- M_Print (16, 16 + 8*i, Demos[i].desc);
+ for (i=0; i < NumberOfNehahraDemos; i++)
+ M_Print (16, 16 + 8*i, NehahraDemos[i].desc);
// line cursor
M_DrawCharacter (8, 16 + demo_cursor*8, 12+((int)(realtime*4)&1));
void M_Menu_Demos_f (void)
{
- key_dest = key_menu;
- m_state = m_demo;
- m_entersound = true;
-
-
- NumberOfDemos = 34;
-
- strcpy(Demos[0].name, "intro"); strcpy(Demos[0].desc, "Prologue");
- strcpy(Demos[1].name, "genf"); strcpy(Demos[1].desc, "The Beginning");
- strcpy(Demos[2].name, "genlab"); strcpy(Demos[2].desc, "A Doomed Project");
- strcpy(Demos[3].name, "nehcre"); strcpy(Demos[3].desc, "The New Recruits");
- strcpy(Demos[4].name, "maxneh"); strcpy(Demos[4].desc, "Breakthrough");
- strcpy(Demos[5].name, "maxchar"); strcpy(Demos[5].desc, "Renewal and Duty");
- strcpy(Demos[6].name, "crisis"); strcpy(Demos[6].desc, "Worlds Collide");
- strcpy(Demos[7].name, "postcris"); strcpy(Demos[7].desc, "Darkening Skies");
- strcpy(Demos[8].name, "hearing"); strcpy(Demos[8].desc, "The Hearing");
- strcpy(Demos[9].name, "getjack"); strcpy(Demos[9].desc, "On a Mexican Radio");
- strcpy(Demos[10].name, "prelude"); strcpy(Demos[10].desc, "Honor and Justice");
- strcpy(Demos[11].name, "abase"); strcpy(Demos[11].desc, "A Message Sent");
- strcpy(Demos[12].name, "effect"); strcpy(Demos[12].desc, "The Other Side");
- strcpy(Demos[13].name, "uhoh"); strcpy(Demos[13].desc, "Missing in Action");
- strcpy(Demos[14].name, "prepare"); strcpy(Demos[14].desc, "The Response");
- strcpy(Demos[15].name, "vision"); strcpy(Demos[15].desc, "Farsighted Eyes");
- strcpy(Demos[16].name, "maxturns"); strcpy(Demos[16].desc, "Enter the Immortal");
- strcpy(Demos[17].name, "backlot"); strcpy(Demos[17].desc, "Separate Ways");
- strcpy(Demos[18].name, "maxside"); strcpy(Demos[18].desc, "The Ancient Runes");
- strcpy(Demos[19].name, "counter"); strcpy(Demos[19].desc, "The New Initiative");
- strcpy(Demos[20].name, "warprep"); strcpy(Demos[20].desc, "Ghosts to the World");
- strcpy(Demos[21].name, "counter1"); strcpy(Demos[21].desc, "A Fate Worse Than Death");
- strcpy(Demos[22].name, "counter2"); strcpy(Demos[22].desc, "Friendly Fire");
- strcpy(Demos[23].name, "counter3"); strcpy(Demos[23].desc, "Minor Setback");
- strcpy(Demos[24].name, "madmax"); strcpy(Demos[24].desc, "Scores to Settle");
- strcpy(Demos[25].name, "quake"); strcpy(Demos[25].desc, "One Man");
- strcpy(Demos[26].name, "cthmm"); strcpy(Demos[26].desc, "Shattered Masks");
- strcpy(Demos[27].name, "shades"); strcpy(Demos[27].desc, "Deal with the Dead");
- strcpy(Demos[28].name, "gophil"); strcpy(Demos[28].desc, "An Unlikely Hero");
- strcpy(Demos[29].name, "cstrike"); strcpy(Demos[29].desc, "War in Hell");
- strcpy(Demos[30].name, "shubset"); strcpy(Demos[30].desc, "The Conspiracy");
- strcpy(Demos[31].name, "shubdie"); strcpy(Demos[31].desc, "Even Death May Die");
- strcpy(Demos[32].name, "newranks"); strcpy(Demos[32].desc, "An Empty Throne");
- strcpy(Demos[33].name, "seal"); strcpy(Demos[33].desc, "The Seal is Broken");
+ key_dest = key_menu;
+ m_state = m_demo;
+ m_entersound = true;
}
void M_Demo_Key (int k)
S_LocalSound ("misc/menu2.wav");
m_state = m_none;
key_dest = key_game;
-// SCR_BeginLoadingPlaque ();
- Cbuf_AddText (va ("playdemo %s\n", Demos[demo_cursor].name));
+ Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name));
return;
case K_UPARROW:
S_LocalSound ("misc/menu1.wav");
demo_cursor--;
if (demo_cursor < 0)
- demo_cursor = NumberOfDemos;
+ demo_cursor = NumberOfNehahraDemos;
break;
case K_DOWNARROW:
case K_RIGHTARROW:
S_LocalSound ("misc/menu1.wav");
demo_cursor++;
- if (demo_cursor > NumberOfDemos)
+ if (demo_cursor > NumberOfNehahraDemos)
demo_cursor = 0;
break;
}
void M_SinglePlayer_Draw (void)
{
- int f;
cachepic_t *p;
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/ttl_sgl.lmp");
- M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp");
- M_DrawPic (72, 32, "gfx/sp_menu.lmp");
- f = (int)(realtime * 10)%6;
+ // BloodBath doesn't have a single player mode
+ if (gamemode == GAME_BLOODBATH)
+ {
+ M_DrawPic ((320 - p->width) / 2, 4, "gfx/ttl_sgl.lmp");
+
+ M_DrawTextBox (60, 8 * 8, 23, 4);
+ M_PrintWhite (102, 10 * 8, "BloodBath is for");
+ M_PrintWhite (83, 11 * 8, "multiplayer play only");
+ }
+ else
+ {
+ int f;
+
+ M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_sgl.lmp");
+ M_DrawPic (72, 32, "gfx/sp_menu.lmp");
- M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
+ f = (int)(realtime * 10)%6;
+
+ M_DrawPic (54, 32 + m_singleplayer_cursor * 20, va("gfx/menudot%i.lmp", f+1));
+ }
}
void M_SinglePlayer_Key (int key)
{
+ if (gamemode == GAME_BLOODBATH)
+ {
+ if (key == K_ESCAPE || key == K_ENTER)
+ m_state = m_main;
+ return;
+ }
+
switch (key)
{
case K_ESCAPE:
if (sv.active)
Cbuf_AddText ("disconnect\n");
Cbuf_AddText ("maxplayers 1\n");
+ Cbuf_AddText ("deathmatch 0\n");
+ Cbuf_AddText ("coop 0\n");
if (gamemode == GAME_NEHAHRA)
Cbuf_AddText ("map nehstart\n");
else
m_state = m_none;
key_dest = key_game;
- // LordHavoc: made SCR_UpdateScreen use a great deal less stack space, no longer an issue
- //// Host_Loadgame_f can't bring up the loading plaque because too much
- //// stack space has been used, so do it now
-//// SCR_BeginLoadingPlaque ();
-
// issue the load command
Cbuf_AddText (va ("load s%i\n", load_cursor) );
return;
//=============================================================================
/* OPTIONS MENU */
-#define OPTIONS_ITEMS (vid_menudrawfn ? 25 : 24)
+#define OPTIONS_ITEMS 27
#define SLIDER_RANGE 10
switch (options_cursor)
{
- case 3: // screen size
- Cvar_SetValue ("viewsize", bound(30, scr_viewsize.value + dir * 10, 120));
- break;
case 4:
- Cvar_SetValue ("r_ser", !r_ser.integer);
+ Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
break;
-
- case 5: // overbright rendering
- Cvar_SetValue ("gl_lightmode", !gl_lightmode.integer);
+ case 5:
+ Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
break;
-
- case 6: // dithering
- Cvar_SetValue ("gl_dither", !gl_dither.integer);
+ case 6:
+ Cvar_SetValueQuick (&r_skyquality, bound(0, r_skyquality.integer + dir, 2));
break;
-
- case 7: // sky quality
- Cvar_SetValue ("r_skyquality", bound(0, r_skyquality.integer + dir, 2));
+ case 7:
+ Cvar_SetValueQuick (&r_ser, !r_ser.integer);
break;
-
- case 8: // hardware gamma
- Cvar_SetValue ("vid_gamma", bound(1, vid_gamma.value + dir * 0.25, 5));
+ case 8:
+ Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
break;
-
- case 9: // hardware brightness
- Cvar_SetValue ("vid_brightness", bound(1, vid_brightness.value + dir * 0.25, 5));
+ case 9:
+ Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
break;
-
- case 10: // hardware contrast
- Cvar_SetValue ("vid_contrast", bound(0.2, vid_contrast.value + dir * 0.08, 1));
+ case 10:
+ Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
break;
-
- case 11: // software brightness
- Cvar_SetValue ("r_brightness", bound(1, r_brightness.value + dir * 0.25, 5));
+ case 11:
+ Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
break;
-
- case 12: // software base brightness
- Cvar_SetValue ("r_contrast", bound(0.2, r_contrast.value + dir * 0.08, 1));
+ case 12:
+ Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.25, 5));
break;
-
- case 13: // music volume
-#ifdef _WIN32
- Cvar_SetValue ("bgmvolume", bound(0, bgmvolume.value + dir * 1.0, 1));
-#else
- Cvar_SetValue ("bgmvolume", bound(0, bgmvolume.value + dir * 0.1, 1));
-#endif
+ case 13:
+ Cvar_SetValueQuick (&v_contrast, bound(0.5, v_contrast.value + dir * 0.25, 5));
break;
-
- case 14: // sfx volume
- Cvar_SetValue ("volume", bound(0, volume.value + dir * 0.1, 1));
+ case 14:
+ Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
break;
-
- case 15: // always run
+ case 15: // music volume
+ #ifdef _WIN32
+ Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1));
+ #else
+ Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
+ #endif
+ break;
+ case 16: // sfx volume
+ Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
+ break;
+ case 17:
+ Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
+ break;
+ case 18:
+ Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
+ break;
+ case 19: // show framerate
+ Cvar_SetValueQuick (&showfps, !showfps.integer);
+ break;
+ case 20: // always run
if (cl_forwardspeed.value > 200)
{
- Cvar_SetValue ("cl_forwardspeed", 200);
- Cvar_SetValue ("cl_backspeed", 200);
+ Cvar_SetValueQuick (&cl_forwardspeed, 200);
+ Cvar_SetValueQuick (&cl_backspeed, 200);
}
else
{
- Cvar_SetValue ("cl_forwardspeed", 400);
- Cvar_SetValue ("cl_backspeed", 400);
+ Cvar_SetValueQuick (&cl_forwardspeed, 400);
+ Cvar_SetValueQuick (&cl_backspeed, 400);
}
break;
-
- case 16: // lookspring
- Cvar_SetValue ("lookspring", !lookspring.integer);
+ case 21: // lookspring
+ Cvar_SetValueQuick (&lookspring, !lookspring.integer);
break;
-
- case 17: // lookstrafe
- Cvar_SetValue ("lookstrafe", !lookstrafe.integer);
+ case 22: // lookstrafe
+ Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
break;
-
- case 18: // mouse speed
- Cvar_SetValue ("sensitivity", bound(1, sensitivity.value + dir * 0.5, 50));
+ case 23: // mouse speed
+ Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
break;
-
- case 19: // mouse look
- Cvar_SetValue ("freelook", !freelook.integer);
+ case 24: // mouse look
+ Cvar_SetValueQuick (&freelook, !freelook.integer);
break;
-
- case 20: // invert mouse
- Cvar_SetValue ("m_pitch", -m_pitch.value);
+ case 25: // invert mouse
+ Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
break;
-
- case 21: // windowed mouse
- Cvar_SetValue ("vid_mouse", !vid_mouse.integer);
- break;
-
- case 22:
- Cvar_SetValue ("crosshair", bound(0, crosshair.integer + dir, 5));
- break;
-
- case 23: // show framerate
- Cvar_SetValue ("showfps", !showfps.integer);
+ case 26: // windowed mouse
+ Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
break;
}
}
M_Print (x, y, "off");
}
+/*
+int m_2dres[] =
+{
+ 320, 200,
+ 320, 240,
+ 400, 300,
+ 512, 384,
+ 640, 480,
+ 800, 600,
+ 1024, 768,
+ 1280, 960,
+ 1600, 1200,
+ 2048, 1536
+};
+
+int M_Num2DResolutions(void)
+{
+ return sizeof(m_2dres) / sizeof(int[2]);
+};
+
+float M_Classify2DResolution(void)
+{
+ int i, num, *res, best, bestdist, diff[3];
+ num = M_Num2DResolutions();
+ best = -1;
+ bestdist = 1000000000;
+ for (i = 0;i < num;i++)
+ {
+ res = m_2dres + i * 2;
+ diff[0] = res[0] - vid.conwidth;
+ diff[1] = res[1] - vid.conheight;
+ diff[2] = 0;
+ dist = DotProduct(diff, diff);
+ if (bestdist > dist)
+ {
+ bestdist = dist;
+ best = i;
+ }
+ }
+ return i;
+}
+
+void M_Adjust2DResolution(int dir)
+{
+ int i, num;
+ i = M_Classify2DResolution() + dir;
+ num = M_Num2DResolutions() - 1;
+ i = bound(0, i, num);
+ Cvar_SetValue("v_2dwidth", m_2dres[i*2]);
+ Cvar_SetValue("v_2dheight", m_2dres[i*2+1]);
+}
+*/
+
void M_Options_Draw (void)
{
float y;
M_Print(16, y, " Customize controls");y += 8;
M_Print(16, y, " Go to console");y += 8;
M_Print(16, y, " Reset to defaults");y += 8;
+ M_ItemPrint(16, y, " Video Options", vid_menudrawfn != NULL);y += 8;
+ M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value);y += 8;
M_Print(16, y, " Screen size");M_DrawSlider(220, y, (scr_viewsize.value - 30) /(120 - 30));y += 8;
+ M_Print(16, y, " Sky Quality");M_DrawSlider(220, y, r_skyquality.value / 2);y += 8;
M_Print(16, y, "Hidden Surface Removal");M_DrawCheckbox(220, y, r_ser.integer);y += 8;
- M_Print(16, y, " Overbright Rendering");M_DrawCheckbox(220, y, gl_lightmode.integer);y += 8;
+ M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, (v_overbrightbits.value) / 4);y += 8;
+ M_Print(16, y, " Texture Combine");M_DrawCheckbox(220, y, gl_combine.integer);y += 8;
M_Print(16, y, " Dithering");M_DrawCheckbox(220, y, gl_dither.integer);y += 8;
- M_Print(16, y, " Sky Quality");M_DrawSlider(220, y, r_skyquality.value / 2);y += 8;
- M_Print(16, y, " Hardware Gamma");M_DrawSlider(220, y, (vid_gamma.value - 1) / 4);y += 8;
- M_Print(16, y, " Hardware Brightness");M_DrawSlider(220, y, (vid_brightness.value - 1) / 4);y += 8;
- M_Print(16, y, " Hardware Contrast");M_DrawSlider(220, y, (vid_contrast.value - 0.2) / 0.8);y += 8;
- M_Print(16, y, " Software Brightness");M_DrawSlider(220, y, (r_brightness.value - 1) / 4);y += 8;
- M_Print(16, y, " Software Contrast");M_DrawSlider(220, y, (r_contrast.value - 0.2) / 0.8);y += 8;
- M_Print(16, y, " CD Music Volume");M_DrawSlider(220, y, bgmvolume.value);y += 8;
- M_Print(16, y, " Sound Volume");M_DrawSlider(220, y, volume.value);y += 8;
+ M_ItemPrint(16, y, "Hardware Gamma Control", hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
+ M_ItemPrint(16, y, " Gamma", v_hwgamma.integer);M_DrawSlider(220, y, (v_gamma.value - 1) / 4);y += 8;
+ M_Print(16, y, " Contrast");M_DrawSlider(220, y, (v_contrast.value - 0.5) / (5 - 0.5));y += 8;
+ M_Print(16, y, " Brightness");M_DrawSlider(220, y, v_brightness.value / 0.8);y += 8;
+ M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value);y += 8;
+ M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value);y += 8;
+ M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
+ M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, (crosshair_size.value - 1) / 4);y += 8;
+ M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8;
M_Print(16, y, " Always Run");M_DrawCheckbox(220, y, cl_forwardspeed.value > 200);y += 8;
M_Print(16, y, " Lookspring");M_DrawCheckbox(220, y, lookspring.integer);y += 8;
M_Print(16, y, " Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.integer);y += 8;
M_Print(16, y, " Mouse Look");M_DrawCheckbox(220, y, freelook.integer);y += 8;
M_Print(16, y, " Invert Mouse");M_DrawCheckbox(220, y, m_pitch.value < 0);y += 8;
M_Print(16, y, " Use Mouse");M_DrawCheckbox(220, y, vid_mouse.integer);y += 8;
- M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
- M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8;
- if (vid_menudrawfn)
- M_Print(16, y, " Video Options");
- y += 8;
// cursor
M_DrawCharacter(200, 32 + options_cursor*8, 12+((int)(realtime*4)&1));
case 2:
Cbuf_AddText ("exec default.cfg\n");
break;
- default:
- // this is really just another case, but since it is calculated...
- if (vid_menudrawfn && options_cursor == (OPTIONS_ITEMS - 1))
+ case 3:
+ if (vid_menudrawfn)
M_Menu_Video_f ();
- else
- M_AdjustSliders (1);
+ break;
+ default:
+ M_AdjustSliders (1);
break;
}
return;
char *bindnames[][2] =
{
{"+attack", "attack"},
-{"impulse 10", "change weapon"},
+{"impulse 10", "next weapon"},
+{"impulse 12", "previous weapon"},
{"+jump", "jump / swim up"},
{"+forward", "walk forward"},
{"+back", "backpedal"},
#define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0]))
+/*
+typedef struct binditem_s
+{
+ char *command, *description;
+ struct binditem_s *next;
+}
+binditem_t;
+
+typedef struct bindcategory_s
+{
+ char *name;
+ binditem_t *binds;
+ struct bindcategory_s *next;
+}
+bindcategory_t;
+
+bindcategory_t *bindcategories = NULL;
+
+void M_ClearBinds (void)
+{
+ for (c = bindcategories;c;c = cnext)
+ {
+ cnext = c->next;
+ for (b = c->binds;b;b = bnext)
+ {
+ bnext = b->next;
+ Z_Free(b);
+ }
+ Z_Free(c);
+ }
+ bindcategories = NULL;
+}
+
+void M_AddBindToCategory(bindcategory_t *c, char *command, char *description)
+{
+ for (b = &c->binds;*b;*b = &(*b)->next);
+ *b = Z_Alloc(sizeof(binditem_t) + strlen(command) + 1 + strlen(description) + 1);
+ *b->command = (char *)((*b) + 1);
+ *b->description = *b->command + strlen(command) + 1;
+ strcpy(*b->command, command);
+ strcpy(*b->description, description);
+}
+
+void M_AddBind (char *category, char *command, char *description)
+{
+ for (c = &bindcategories;*c;c = &(*c)->next)
+ {
+ if (!strcmp(category, (*c)->name))
+ {
+ M_AddBindToCategory(*c, command, description);
+ return;
+ }
+ }
+ *c = Z_Alloc(sizeof(bindcategory_t));
+ M_AddBindToCategory(*c, command, description);
+}
+
+void M_DefaultBinds (void)
+{
+ M_ClearBinds();
+ M_AddBind("movement", "+jump", "jump / swim up");
+ M_AddBind("movement", "+forward", "walk forward");
+ M_AddBind("movement", "+back", "backpedal");
+ M_AddBind("movement", "+left", "turn left");
+ M_AddBind("movement", "+right", "turn right");
+ M_AddBind("movement", "+speed", "run");
+ M_AddBind("movement", "+moveleft", "step left");
+ M_AddBind("movement", "+moveright", "step right");
+ M_AddBind("movement", "+strafe", "sidestep");
+ M_AddBind("movement", "+lookup", "look up");
+ M_AddBind("movement", "+lookdown", "look down");
+ M_AddBind("movement", "centerview", "center view");
+ M_AddBind("movement", "+mlook", "mouse look");
+ M_AddBind("movement", "+klook", "keyboard look");
+ M_AddBind("movement", "+moveup", "swim up");
+ M_AddBind("movement", "+movedown", "swim down");
+ M_AddBind("weapons", "+attack", "attack");
+ M_AddBind("weapons", "impulse 10", "next weapon");
+ M_AddBind("weapons", "impulse 12", "previous weapon");
+ M_AddBind("weapons", "impulse 1", "select weapon 1 (axe)");
+ M_AddBind("weapons", "impulse 2", "select weapon 2 (shotgun)");
+ M_AddBind("weapons", "impulse 3", "select weapon 3 (super )");
+ M_AddBind("weapons", "impulse 4", "select weapon 4 (nailgun)");
+ M_AddBind("weapons", "impulse 5", "select weapon 5 (super nailgun)");
+ M_AddBind("weapons", "impulse 6", "select weapon 6 (grenade launcher)");
+ M_AddBind("weapons", "impulse 7", "select weapon 7 (rocket launcher)");
+ M_AddBind("weapons", "impulse 8", "select weapon 8 (lightning gun)");
+}
+*/
+
+
int keys_cursor;
int bind_grab;
m_entersound = true;
}
+#define NUMKEYS 5
-void M_FindKeysForCommand (char *command, int *twokeys)
+void M_FindKeysForCommand (char *command, int *keys)
{
int count;
int j;
- int l;
char *b;
- twokeys[0] = twokeys[1] = -1;
- l = strlen(command);
+ for (j = 0;j < NUMKEYS;j++)
+ keys[j] = -1;
+
count = 0;
for (j=0 ; j<256 ; j++)
b = keybindings[j];
if (!b)
continue;
- if (!strncmp (b, command, l) )
+ if (!strcmp (b, command) )
{
- twokeys[count] = j;
- count++;
- if (count == 2)
+ keys[count++] = j;
+ if (count == NUMKEYS)
break;
}
}
void M_UnbindCommand (char *command)
{
int j;
- int l;
char *b;
- l = strlen(command);
-
for (j=0 ; j<256 ; j++)
{
b = keybindings[j];
if (!b)
continue;
- if (!strncmp (b, command, l) )
+ if (!strcmp (b, command))
Key_SetBinding (j, "");
}
}
void M_Keys_Draw (void)
{
- int i, l;
- int keys[2];
- char *name;
- int x, y;
+ int i, j;
+ int keys[NUMKEYS];
+ int y;
cachepic_t *p;
+ char keystring[1024];
p = Draw_CachePic ("gfx/ttl_cstm.lmp");
M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm.lmp");
M_Print (16, y, bindnames[i][1]);
- l = strlen (bindnames[i][0]);
-
M_FindKeysForCommand (bindnames[i][0], keys);
+ // LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer
if (keys[0] == -1)
- {
- M_Print (140, y, "???");
- }
+ strcpy(keystring, "???");
else
{
- name = Key_KeynumToString (keys[0]);
- M_Print (140, y, name);
- x = strlen(name) * 8;
- if (keys[1] != -1)
+ keystring[0] = 0;
+ for (j = 0;j < NUMKEYS;j++)
{
- M_Print (140 + x + 8, y, "or");
- M_Print (140 + x + 32, y, Key_KeynumToString (keys[1]));
+ if (keys[j] != -1)
+ {
+ if (j > 0)
+ strcat(keystring, " or ");
+ strcat(keystring, Key_KeynumToString (keys[j]));
+ }
}
}
+ M_Print (140, y, keystring);
}
if (bind_grab)
void M_Keys_Key (int k)
{
char cmd[80];
- int keys[2];
+ int keys[NUMKEYS];
if (bind_grab)
{ // defining a key
{
bind_grab = false;
}
- else if (k != '`')
+ else //if (k != '`')
{
sprintf (cmd, "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]);
Cbuf_InsertText (cmd);
case K_ENTER: // go into bind mode
M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
S_LocalSound ("misc/menu2.wav");
- if (keys[1] != -1)
+ if (keys[NUMKEYS - 1] != -1)
M_UnbindCommand (bindnames[keys_cursor][0]);
bind_grab = true;
break;
" for trying to quit! ",
" Press Y to get ",
" smacked out. ",
-
+
" Press Y to quit like a ",
" big loser in life. ",
" Press N to stay proud ",
" his children trying to ",
" quit. Press Y to return",
" to your Tinkertoys. ",
-
+
" If you quit now, I'll ",
" throw a blanket-party ",
" for you next time! ",
char *description;
} level_t;
-level_t levels[] =
+typedef struct
+{
+ char *description;
+ int firstLevel;
+ int levels;
+} episode_t;
+
+typedef struct
+{
+ char *gamename;
+ level_t *levels;
+ episode_t *episodes;
+ int numepisodes;
+}
+gamelevels_t;
+
+level_t quakelevels[] =
{
{"start", "Entrance"}, // 0
{"dm6", "The Dark Zone"}
};
+episode_t quakeepisodes[] =
+{
+ {"Welcome to Quake", 0, 1},
+ {"Doomed Dimension", 1, 8},
+ {"Realm of Black Magic", 9, 7},
+ {"Netherworld", 16, 7},
+ {"The Elder World", 23, 8},
+ {"Final Level", 31, 1},
+ {"Deathmatch Arena", 32, 6}
+};
+
//MED 01/06/97 added hipnotic levels
level_t hipnoticlevels[] =
{
{"hipdm1", "The Edge of Oblivion"} // 17
};
+//MED 01/06/97 added hipnotic episodes
+episode_t hipnoticepisodes[] =
+{
+ {"Scourge of Armagon", 0, 1},
+ {"Fortress of the Dead", 1, 5},
+ {"Dominion of Darkness", 6, 6},
+ {"The Rift", 12, 4},
+ {"Final Level", 16, 1},
+ {"Deathmatch Arena", 17, 1}
+};
+
//PGM 01/07/97 added rogue levels
//PGM 03/02/97 added dmatch level
level_t roguelevels[] =
{"ctf1", "Division of Change"}
};
-typedef struct
-{
- char *description;
- int firstLevel;
- int levels;
-} episode_t;
-
-episode_t episodes[] =
-{
- {"Welcome to Quake", 0, 1},
- {"Doomed Dimension", 1, 8},
- {"Realm of Black Magic", 9, 7},
- {"Netherworld", 16, 7},
- {"The Elder World", 23, 8},
- {"Final Level", 31, 1},
- {"Deathmatch Arena", 32, 6}
-};
-
-//MED 01/06/97 added hipnotic episodes
-episode_t hipnoticepisodes[] =
-{
- {"Scourge of Armagon", 0, 1},
- {"Fortress of the Dead", 1, 5},
- {"Dominion of Darkness", 6, 6},
- {"The Rift", 12, 4},
- {"Final Level", 16, 1},
- {"Deathmatch Arena", 17, 1}
-};
-
//PGM 01/07/97 added rogue episodes
//PGM 03/02/97 added dmatch episode
episode_t rogueepisodes[] =
{"Dimension of the Lost", 17, 2}
};
+// Map list for BloodBath
+level_t bloodbathlevels[] =
+{
+ {"bb1", "The Stronghold"},
+ {"bb2", "Winter Wonderland"},
+ {"bb3", "Bodies"},
+ {"bb4", "The Tower"},
+ {"bb5", "Click!"},
+ {"bb7", "Midgard"},
+ {"bb8", "Fun With Heads"},
+
+ {"dm1", "Monolith Building #11"},
+ {"dm2", "Power!"},
+ {"dm3", "Area 15"},
+
+ {"cpbb01", "Crypt of Despair"},
+ {"cpbb03", "Unholy Cathedral"},
+
+ {"b2a15", "A15"},
+ {"barena", "Blood Arena"},
+ {"bkeep", "Blood Keep"},
+ {"bstar", "Brownstar"},
+ {"crypt", "The Crypt"},
+
+ {"bb3_2k1", "Bodies Infusion"},
+ {"qbb1", "The Confluence"},
+ {"qbb2", "Kathartic"},
+ {"qbb3", "Caleb's Woodland Retreat"},
+ {"qe1m7", "The House of Chthon"}
+};
+
+episode_t bloodbathepisodes[] =
+{
+ {"Blood", 0, 7},
+ {"Plasma Pack", 7, 3},
+ {"Cryptic Passage", 10, 2},
+ {"Blood 2", 12, 5},
+ {"BloodBath", 17, 5}
+};
+
+gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
+gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
+gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
+gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
+gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
+gamelevels_t bloodbathgame = {"BloodBath", bloodbathlevels, bloodbathepisodes, 5};
+
+typedef struct
+{
+ int gameid;
+ gamelevels_t *notregistered;
+ gamelevels_t *registered;
+}
+gameinfo_t;
+
+gameinfo_t gamelist[] =
+{
+ {GAME_NORMAL, &sharewarequakegame, ®isteredquakegame},
+ {GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame},
+ {GAME_ROGUE, &roguegame, &roguegame},
+ {GAME_NEHAHRA, &nehahragame, &nehahragame},
+ {GAME_FIENDARENA, &sharewarequakegame, ®isteredquakegame},
+ {GAME_ZYMOTIC, &sharewarequakegame, ®isteredquakegame},
+ {GAME_BLOODBATH, &bloodbathgame, &bloodbathgame},
+ {-1, &sharewarequakegame, ®isteredquakegame} // final fallback
+};
+
+gamelevels_t *lookupgameinfo(void)
+{
+ int i;
+ for (i = 0;gamelist[i].gameid >= 0 && gamelist[i].gameid != gamemode;i++);
+ if (registered.integer)
+ return gamelist[i].registered;
+ else
+ return gamelist[i].notregistered;
+}
+
int startepisode;
int startlevel;
int maxplayers;
{
cachepic_t *p;
int x;
+ gamelevels_t *g;
M_DrawPic (16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic ("gfx/p_multi.lmp");
M_Print (160, 56, va("%i", maxplayers) );
M_Print (0, 64, " Game Type");
- if (!coop.integer && !deathmatch.integer)
- Cvar_SetValue("deathmatch", 1);
- if (coop.integer)
- M_Print (160, 64, "Cooperative");
+ if (gamemode == GAME_BLOODBATH)
+ {
+ if (!deathmatch.integer)
+ Cvar_SetValue("deathmatch", 1);
+ if (deathmatch.integer == 2)
+ M_Print (160, 64, "Capture the Flag");
+ else
+ M_Print (160, 64, "Blood Bath");
+ }
else
- M_Print (160, 64, "Deathmatch");
+ {
+ if (!coop.integer && !deathmatch.integer)
+ Cvar_SetValue("deathmatch", 1);
+ if (coop.integer)
+ M_Print (160, 64, "Cooperative");
+ else
+ M_Print (160, 64, "Deathmatch");
+ }
M_Print (0, 72, " Teamplay");
if (gamemode == GAME_ROGUE)
}
M_Print (160, 72, msg);
}
+ else if (gamemode == GAME_BLOODBATH)
+ {
+ char *msg;
+
+ switch (teamplay.integer)
+ {
+ case 0: msg = "Off"; break;
+ case 2: msg = "Friendly Fire"; break;
+ default: msg = "No Friendly Fire"; break;
+ }
+ M_Print (160, 72, msg);
+ }
else
{
char *msg;
else
M_Print (160, 96, va("%i minutes", timelimit.integer));
+ g = lookupgameinfo();
+
M_Print (0, 112, " Episode");
- //MED 01/06/97 added hipnotic episodes
- if (gamemode == GAME_HIPNOTIC)
- M_Print (160, 112, hipnoticepisodes[startepisode].description);
- //PGM 01/07/97 added rogue episodes
- else if (gamemode == GAME_ROGUE)
- M_Print (160, 112, rogueepisodes[startepisode].description);
- else if (gamemode == GAME_NEHAHRA)
- M_Print (160, 112, nehahraepisodes[startepisode].description);
- else
- M_Print (160, 112, episodes[startepisode].description);
+ M_Print (160, 112, g->episodes[startepisode].description);
M_Print (0, 120, " Level");
- //MED 01/06/97 added hipnotic episodes
- if (gamemode == GAME_HIPNOTIC)
- {
- M_Print (160, 120, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name);
- }
- //PGM 01/07/97 added rogue episodes
- else if (gamemode == GAME_ROGUE)
- {
- M_Print (160, 120, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name);
- }
- else if (gamemode == GAME_NEHAHRA)
- {
- M_Print (160, 120, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].name);
- }
- else
- {
- M_Print (160, 120, levels[episodes[startepisode].firstLevel + startlevel].description);
- M_Print (160, 128, levels[episodes[startepisode].firstLevel + startlevel].name);
- }
+ M_Print (160, 120, g->levels[g->episodes[startepisode].firstLevel + startlevel].description);
+ M_Print (160, 128, g->levels[g->episodes[startepisode].firstLevel + startlevel].name);
// line cursor
M_DrawCharacter (144, gameoptions_cursor_table[gameoptions_cursor], 12+((int)(realtime*4)&1));
void M_NetStart_Change (int dir)
{
+ gamelevels_t *g;
int count;
switch (gameoptions_cursor)
break;
case 2:
- if (deathmatch.integer) // changing from deathmatch to coop
+ if (gamemode == GAME_BLOODBATH)
{
- Cvar_SetValue ("coop", 1);
- Cvar_SetValue ("deathmatch", 0);
+ if (deathmatch.integer == 2) // changing from CTF to BloodBath
+ Cvar_SetValueQuick (&deathmatch, 0);
+ else // changing from BloodBath to CTF
+ Cvar_SetValueQuick (&deathmatch, 2);
}
- else // changing from coop to deathmatch
+ else
{
- Cvar_SetValue ("coop", 0);
- Cvar_SetValue ("deathmatch", 1);
+ if (deathmatch.integer) // changing from deathmatch to coop
+ {
+ Cvar_SetValueQuick (&coop, 1);
+ Cvar_SetValueQuick (&deathmatch, 0);
+ }
+ else // changing from coop to deathmatch
+ {
+ Cvar_SetValueQuick (&coop, 0);
+ Cvar_SetValueQuick (&deathmatch, 1);
+ }
}
break;
else
count = 2;
- Cvar_SetValue ("teamplay", teamplay.integer + dir);
+ Cvar_SetValueQuick (&teamplay, teamplay.integer + dir);
if (teamplay.integer > count)
- Cvar_SetValue ("teamplay", 0);
+ Cvar_SetValueQuick (&teamplay, 0);
else if (teamplay.integer < 0)
- Cvar_SetValue ("teamplay", count);
+ Cvar_SetValueQuick (&teamplay, count);
break;
case 4:
- Cvar_SetValue ("skill", skill.integer + dir);
+ Cvar_SetValueQuick (&skill, skill.integer + dir);
if (skill.integer > 3)
- Cvar_SetValue ("skill", 0);
+ Cvar_SetValueQuick (&skill, 0);
if (skill.integer < 0)
- Cvar_SetValue ("skill", 3);
+ Cvar_SetValueQuick (&skill, 3);
break;
case 5:
- Cvar_SetValue ("fraglimit", fraglimit.integer + dir*10);
+ Cvar_SetValueQuick (&fraglimit, fraglimit.integer + dir*10);
if (fraglimit.integer > 100)
- Cvar_SetValue ("fraglimit", 0);
+ Cvar_SetValueQuick (&fraglimit, 0);
if (fraglimit.integer < 0)
- Cvar_SetValue ("fraglimit", 100);
+ Cvar_SetValueQuick (&fraglimit, 100);
break;
case 6:
- Cvar_SetValue ("timelimit", timelimit.value + dir*5);
+ Cvar_SetValueQuick (&timelimit, timelimit.value + dir*5);
if (timelimit.value > 60)
- Cvar_SetValue ("timelimit", 0);
+ Cvar_SetValueQuick (&timelimit, 0);
if (timelimit.value < 0)
- Cvar_SetValue ("timelimit", 60);
+ Cvar_SetValueQuick (&timelimit, 60);
break;
case 7:
startepisode += dir;
- //MED 01/06/97 added hipnotic count
- if (gamemode == GAME_HIPNOTIC)
- count = 6;
- //PGM 01/07/97 added rogue count
- //PGM 03/02/97 added 1 for dmatch episode
- else if (gamemode == GAME_ROGUE)
- count = 4;
- else if (gamemode == GAME_NEHAHRA)
- count = 4;
- else if (registered.integer)
- count = 7;
- else
- count = 2;
+ g = lookupgameinfo();
if (startepisode < 0)
- startepisode = count - 1;
+ startepisode = g->numepisodes - 1;
- if (startepisode >= count)
+ if (startepisode >= g->numepisodes)
startepisode = 0;
startlevel = 0;
case 8:
startlevel += dir;
- //MED 01/06/97 added hipnotic episodes
- if (gamemode == GAME_HIPNOTIC)
- count = hipnoticepisodes[startepisode].levels;
- //PGM 01/06/97 added hipnotic episodes
- else if (gamemode == GAME_ROGUE)
- count = rogueepisodes[startepisode].levels;
- else if (gamemode == GAME_NEHAHRA)
- count = nehahraepisodes[startepisode].levels;
- else
- count = episodes[startepisode].levels;
+ g = lookupgameinfo();
if (startlevel < 0)
- startlevel = count - 1;
+ startlevel = g->episodes[startepisode].levels - 1;
- if (startlevel >= count)
+ if (startlevel >= g->episodes[startepisode].levels)
startlevel = 0;
break;
}
void M_GameOptions_Key (int key)
{
+ gamelevels_t *g;
+
switch (key)
{
case K_ESCAPE:
Cbuf_AddText ("disconnect\n");
Cbuf_AddText ("listen 0\n"); // so host_netport will be re-examined
Cbuf_AddText ( va ("maxplayers %u\n", maxplayers) );
-// SCR_BeginLoadingPlaque ();
-
- if (gamemode == GAME_HIPNOTIC)
- Cbuf_AddText ( va ("map %s\n", hipnoticlevels[hipnoticepisodes[startepisode].firstLevel + startlevel].name) );
- else if (gamemode == GAME_ROGUE)
- Cbuf_AddText ( va ("map %s\n", roguelevels[rogueepisodes[startepisode].firstLevel + startlevel].name) );
- else if (gamemode == GAME_NEHAHRA)
- Cbuf_AddText ( va ("map %s\n", nehahralevels[nehahraepisodes[startepisode].firstLevel + startlevel].name) );
- else
- Cbuf_AddText ( va ("map %s\n", levels[episodes[startepisode].firstLevel + startlevel].name) );
+ g = lookupgameinfo();
+ Cbuf_AddText ( va ("map %s\n", g->levels[g->episodes[startepisode].firstLevel + startlevel].name) );
return;
}
projects / xonotic / darkplaces.git / blobdiff