keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

fix very old typo. tnx to e-andrew.

Browse Source 
git-svn-id: svn://kolibrios.org@5355 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2015-01-05 21:34:58 +00:00
parent 8aa816f1ce
commit 01e7a24fe6
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
programs/games/doom/trunk/d_main.c
View File

@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*- // Emacs style mode select -*- C++ -*-
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Id:$ // $Id:$
@ -160,12 +160,12 @@ void D_PostEvent (event_t* ev)
void D_ProcessEvents (void) void D_ProcessEvents (void)
{ {
event_t* ev; event_t* ev;
// IF STORE DEMO, DO NOT ACCEPT INPUT // IF STORE DEMO, DO NOT ACCEPT INPUT
if ( ( gamemode == commercial ) if ( ( gamemode == commercial )
&& (W_CheckNumForName("map01")<0) ) && (W_CheckNumForName("map01")<0) )
return; return;
for ( ; eventtail != eventhead ; eventtail = (++eventtail)&(MAXEVENTS-1) ) for ( ; eventtail != eventhead ; eventtail = (++eventtail)&(MAXEVENTS-1) )
{ {
ev = &events[eventtail]; ev = &events[eventtail];
@ -213,9 +213,9 @@ void D_Display (void)
{ {
XXX(0); XXX(0);
return; // for comparative timing / profiling return; // for comparative timing / profiling
} }
redrawsbar = false; redrawsbar = false;
// change the view size if needed // change the view size if needed
if (setsizeneeded) if (setsizeneeded)
{ {
@ -233,7 +233,7 @@ void D_Display (void)
wipe = true; wipe = true;
wipe_StartScreen(0, 0, SCREENWIDTH, SCREENHEIGHT); wipe_StartScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
} }
else else
wipe = false; wipe = false;
XXX(6); XXX(6);
@ -275,12 +275,12 @@ void D_Display (void)
XXX(14); XXX(14);
break; break;
} }
// draw buffered stuff to screen // draw buffered stuff to screen
XXX(15); XXX(15);
I_UpdateNoBlit (); I_UpdateNoBlit ();
XXX(16); XXX(16);
// draw the view directly // draw the view directly
if (gamestate == GS_LEVEL && !automapactive && gametic) if (gamestate == GS_LEVEL && !automapactive && gametic)
R_RenderPlayerView (&players[displayplayer]); R_RenderPlayerView (&players[displayplayer]);
@ -289,7 +289,7 @@ void D_Display (void)
if (gamestate == GS_LEVEL && gametic) if (gamestate == GS_LEVEL && gametic)
HU_Drawer (); HU_Drawer ();
XXX(18); XXX(18);
// clean up border stuff // clean up border stuff
if (gamestate != oldgamestate && gamestate != GS_LEVEL) if (gamestate != oldgamestate && gamestate != GS_LEVEL)
I_SetPalette (W_CacheLumpName ("PLAYPAL",PU_CACHE)); I_SetPalette (W_CacheLumpName ("PLAYPAL",PU_CACHE));
@ -326,7 +326,7 @@ void D_Display (void)
viewactivestate = viewactive; viewactivestate = viewactive;
inhelpscreensstate = inhelpscreens; inhelpscreensstate = inhelpscreens;
oldgamestate = wipegamestate = gamestate; oldgamestate = wipegamestate = gamestate;
// draw pause pic // draw pause pic
if (paused) if (paused)
{ {
@ -356,7 +356,7 @@ void D_Display (void)
return; return;
} }
XXX(32); XXX(32);
// wipe update // wipe update
wipe_EndScreen(0, 0, SCREENWIDTH, SCREENHEIGHT); wipe_EndScreen(0, 0, SCREENWIDTH, SCREENHEIGHT);
XXX(33); XXX(33);
@ -395,23 +395,23 @@ void D_DoomLoop (void)
{ {
if (demorecording) if (demorecording)
G_BeginRecording (); G_BeginRecording ();
if (M_CheckParm ("-debugfile")) if (M_CheckParm ("-debugfile"))
{ {
char filename[32]; char filename[32];
sprintf (filename,"debug%i.txt",consoleplayer); sprintf (filename,"debug%i.txt",consoleplayer);
debugfile = fopen (filename,"w"); debugfile = fopen (filename,"w");
} }
I_InitGraphics (); I_InitGraphics ();
while (1) while (1)
{ {
// frame syncronous IO operations // frame syncronous IO operations
XXX(100); XXX(100);
I_StartFrame (); I_StartFrame ();
XXX(101); XXX(101);
// process one or more tics // process one or more tics
if (singletics) if (singletics)
{ {
@ -420,11 +420,11 @@ void D_DoomLoop (void)
D_ProcessEvents (); D_ProcessEvents ();
G_BuildTiccmd (&netcmds[consoleplayer][maketic%BACKUPTICS]); G_BuildTiccmd (&netcmds[consoleplayer][maketic%BACKUPTICS]);
if (advancedemo) if (advancedemo)
{ {
D_DoAdvanceDemo (); D_DoAdvanceDemo ();
}; };
M_Ticker (); M_Ticker ();
G_Ticker (); G_Ticker ();
gametic++; gametic++;
@ -436,7 +436,7 @@ void D_DoomLoop (void)
S_UpdateSounds (players[consoleplayer].mo);// move positional sounds S_UpdateSounds (players[consoleplayer].mo);// move positional sounds
D_Display (); D_Display ();
// I_UpdateSound(); // I_UpdateSound();
XXX(105); XXX(105);
} }
} }
@ -498,7 +498,7 @@ void D_AdvanceDemo (void)
demosequence = (demosequence+1)%7; demosequence = (demosequence+1)%7;
else else
demosequence = (demosequence+1)%6; demosequence = (demosequence+1)%6;
switch (demosequence) switch (demosequence)
{ {
case 0: case 0:
@ -579,13 +579,13 @@ void D_AddFile (char *file)
{ {
int numwadfiles; int numwadfiles;
char *newfile; char *newfile;
for (numwadfiles = 0 ; wadfiles[numwadfiles] ; numwadfiles++) for (numwadfiles = 0 ; wadfiles[numwadfiles] ; numwadfiles++)
; ;
newfile = malloc (strlen(file)+1); newfile = malloc (strlen(file)+1);
strcpy (newfile, file); strcpy (newfile, file);
wadfiles[numwadfiles] = newfile; wadfiles[numwadfiles] = newfile;
} }
@ -619,11 +619,11 @@ void IdentifyVersion (void)
// Retail. // Retail.
doomuwad = malloc(strlen(doomwaddir)+1+8+1); doomuwad = malloc(strlen(doomwaddir)+1+8+1);
sprintf(doomuwad, "%s/doomu.wad", doomwaddir); sprintf(doomuwad, "%s/doomu.wad", doomwaddir);
// Registered. // Registered.
doomwad = malloc(strlen(doomwaddir)+1+8+1); doomwad = malloc(strlen(doomwaddir)+1+8+1);
sprintf(doomwad, "%s/doom.wad", doomwaddir); sprintf(doomwad, "%s/doom.wad", doomwaddir);
// Shareware. // Shareware.
doom1wad = malloc(strlen(doomwaddir)+1+9+1); doom1wad = malloc(strlen(doomwaddir)+1+9+1);
sprintf(doom1wad, "%s/doom1.wad", doomwaddir); sprintf(doom1wad, "%s/doom1.wad", doomwaddir);
@ -631,7 +631,7 @@ void IdentifyVersion (void)
// Bug, dear Shawn. // Bug, dear Shawn.
// Insufficient malloc, caused spurious realloc errors. // Insufficient malloc, caused spurious realloc errors.
plutoniawad = malloc(strlen(doomwaddir)+1+/*9*/12+1); plutoniawad = malloc(strlen(doomwaddir)+1+/*9*/12+1);
sprintf(plutoniawad, "%splutonia.wad", doomwaddir); sprintf(plutoniawad, "%s/plutonia.wad", doomwaddir);
tntwad = malloc(strlen(doomwaddir)+1+9+1); tntwad = malloc(strlen(doomwaddir)+1+9+1);
sprintf(tntwad, "%s/tnt.wad", doomwaddir); sprintf(tntwad, "%s/tnt.wad", doomwaddir);
@ -679,7 +679,7 @@ void IdentifyVersion (void)
D_AddFile (DEVDATA"tnt.wad"); D_AddFile (DEVDATA"tnt.wad");
else*/ else*/
D_AddFile (DEVDATA"doom2.wad"); D_AddFile (DEVDATA"doom2.wad");
D_AddFile (DEVMAPS"cdata/texture1.lmp"); D_AddFile (DEVMAPS"cdata/texture1.lmp");
D_AddFile (DEVMAPS"cdata/pnames.lmp"); D_AddFile (DEVMAPS"cdata/pnames.lmp");
strcpy (basedefault,DEVDATA"default.cfg"); strcpy (basedefault,DEVDATA"default.cfg");
@ -753,7 +753,7 @@ void FindResponseFile (void)
{ {
int i; int i;
#define MAXARGVS 100 #define MAXARGVS 100
for (i = 1;i < myargc;i++) for (i = 1;i < myargc;i++)
if (myargv[i][0] == '@') if (myargv[i][0] == '@')
{ {
@ -766,7 +766,7 @@ void FindResponseFile (void)
char *file; char *file;
char *moreargs[20]; char *moreargs[20];
char *firstargv; char *firstargv;
// READ THE RESPONSE FILE INTO MEMORY // READ THE RESPONSE FILE INTO MEMORY
handle = fopen (&myargv[i][1],"rb"); handle = fopen (&myargv[i][1],"rb");
if (!handle) if (!handle)
@ -781,16 +781,16 @@ void FindResponseFile (void)
// file = malloc (size); // file = malloc (size);
// fread (file,size,1,handle); // fread (file,size,1,handle);
// fclose (handle); // fclose (handle);
// KEEP ALL CMDLINE ARGS FOLLOWING @RESPONSEFILE ARG // KEEP ALL CMDLINE ARGS FOLLOWING @RESPONSEFILE ARG
for (index = 0,k = i+1; k < myargc; k++) for (index = 0,k = i+1; k < myargc; k++)
moreargs[index++] = myargv[k]; moreargs[index++] = myargv[k];
firstargv = myargv[0]; firstargv = myargv[0];
myargv = malloc(sizeof(char *)*MAXARGVS); myargv = malloc(sizeof(char *)*MAXARGVS);
memset(myargv,0,sizeof(char *)*MAXARGVS); memset(myargv,0,sizeof(char *)*MAXARGVS);
myargv[0] = firstargv; myargv[0] = firstargv;
infile = file; infile = file;
indexinfile = k = 0; indexinfile = k = 0;
indexinfile++; // SKIP PAST ARGV[0] (KEEP IT) indexinfile++; // SKIP PAST ARGV[0] (KEEP IT)
@ -805,11 +805,11 @@ void FindResponseFile (void)
((*(infile+k)<= ' ') || (*(infile+k)>'z'))) ((*(infile+k)<= ' ') || (*(infile+k)>'z')))
k++; k++;
} while(k < size); } while(k < size);
for (k = 0;k < index;k++) for (k = 0;k < index;k++)
myargv[indexinfile++] = moreargs[k]; myargv[indexinfile++] = moreargs[k];
myargc = indexinfile; myargc = indexinfile;
// DISPLAY ARGS // DISPLAY ARGS
// __libclog_printf("%d command-line args:\n",myargc); // __libclog_printf("%d command-line args:\n",myargc);
// for (k=1;k<myargc;k++) // for (k=1;k<myargc;k++)
@ -833,7 +833,7 @@ void D_DoomMain (void)
IdentifyVersion (); IdentifyVersion ();
modifiedgame = false; modifiedgame = false;
nomonsters = M_CheckParm ("-nomonsters"); nomonsters = M_CheckParm ("-nomonsters");
respawnparm = M_CheckParm ("-respawn"); respawnparm = M_CheckParm ("-respawn");
fastparm = M_CheckParm ("-fast"); fastparm = M_CheckParm ("-fast");
@ -897,19 +897,19 @@ void D_DoomMain (void)
VERSION_NUM/100,VERSION_NUM%100); VERSION_NUM/100,VERSION_NUM%100);
break; break;
} }
// __libclog_printf ("%s\n",title); // __libclog_printf ("%s\n",title);
if (devparm) if (devparm)
printf(D_DEVSTR); printf(D_DEVSTR);
// turbo option // turbo option
if ( (p=M_CheckParm ("-turbo")) ) if ( (p=M_CheckParm ("-turbo")) )
{ {
int scale = 200; int scale = 200;
extern int forwardmove[2]; extern int forwardmove[2];
extern int sidemove[2]; extern int sidemove[2];
if (p<myargc-1) if (p<myargc-1)
scale = atoi (myargv[p+1]); scale = atoi (myargv[p+1]);
if (scale < 10) if (scale < 10)
@ -922,7 +922,7 @@ void D_DoomMain (void)
sidemove[0] = sidemove[0]*scale/100; sidemove[0] = sidemove[0]*scale/100;
sidemove[1] = sidemove[1]*scale/100; sidemove[1] = sidemove[1]*scale/100;
} }
// add any files specified on the command line with -file wadfile // add any files specified on the command line with -file wadfile
// to the wad list // to the wad list
// //
@ -942,7 +942,7 @@ void D_DoomMain (void)
sprintf (file,"~"DEVMAPS"E%cM%c.wad", sprintf (file,"~"DEVMAPS"E%cM%c.wad",
myargv[p+1][0], myargv[p+2][0]); myargv[p+1][0], myargv[p+2][0]);
break; break;
case commercial: case commercial:
default: default:
p = atoi (myargv[p+1]); p = atoi (myargv[p+1]);
@ -954,7 +954,7 @@ void D_DoomMain (void)
} }
D_AddFile (file); D_AddFile (file);
} }
p = M_CheckParm ("-file"); p = M_CheckParm ("-file");
if (p) if (p)
{ {
@ -975,13 +975,13 @@ void D_DoomMain (void)
sprintf (file,"%s.lmp", myargv[p+1]); sprintf (file,"%s.lmp", myargv[p+1]);
D_AddFile (file); D_AddFile (file);
} }
// get skill / episode / map from parms // get skill / episode / map from parms
startskill = sk_medium; startskill = sk_medium;
startepisode = 1; startepisode = 1;
startmap = 1; startmap = 1;
autostart = false; autostart = false;
p = M_CheckParm ("-skill"); p = M_CheckParm ("-skill");
if (p && p < myargc-1) if (p && p < myargc-1)
{ {
@ -996,7 +996,7 @@ void D_DoomMain (void)
startmap = 1; startmap = 1;
autostart = true; autostart = true;
} }
p = M_CheckParm ("-timer"); p = M_CheckParm ("-timer");
if (p && p < myargc-1 && deathmatch) if (p && p < myargc-1 && deathmatch)
{ {
@ -1050,19 +1050,19 @@ void D_DoomMain (void)
"dphoof","bfgga0","heada1","cybra1","spida1d1" "dphoof","bfgga0","heada1","cybra1","spida1d1"
}; };
int i; int i;
if ( gamemode == shareware) if ( gamemode == shareware)
I_Error("\n\rYou cannot -file with the shareware " I_Error("\n\rYou cannot -file with the shareware "
"version. Register!"); "version. Register!");
// Check for fake IWAD with right name, // Check for fake IWAD with right name,
// but w/o all the lumps of the registered version. // but w/o all the lumps of the registered version.
if (gamemode == registered) if (gamemode == registered)
for (i = 0;i < 23; i++) for (i = 0;i < 23; i++)
if (W_CheckNumForName(name[i])<0) if (W_CheckNumForName(name[i])<0)
I_Error("\n\rThis is not the registered version."); I_Error("\n\rThis is not the registered version.");
} }
// Iff additonal PWAD files are used, print modified banner // Iff additonal PWAD files are used, print modified banner
if (modifiedgame) if (modifiedgame)
{ {
@ -1076,7 +1076,7 @@ void D_DoomMain (void)
// ); // );
// getchar (); // getchar ();
} }
// Check and print which version is executed. // Check and print which version is executed.
switch ( gamemode ) switch ( gamemode )
@ -1099,7 +1099,7 @@ void D_DoomMain (void)
// "===========================================================================\n\r" // "===========================================================================\n\r"
// ); // );
break; break;
default: default:
// Ouch. // Ouch.
break; break;
@ -1134,12 +1134,12 @@ void D_DoomMain (void)
if (p && p<myargc-1) if (p && p<myargc-1)
{ {
// for statistics driver // for statistics driver
extern void* statcopy; extern void* statcopy;
statcopy = (void*)atoi(myargv[p+1]); statcopy = (void*)atoi(myargv[p+1]);
//printf ("External statistics registered.\n\r"); //printf ("External statistics registered.\n\r");
} }
// start the apropriate game based on parms // start the apropriate game based on parms
p = M_CheckParm ("-record"); p = M_CheckParm ("-record");
@ -1148,7 +1148,7 @@ void D_DoomMain (void)
G_RecordDemo (myargv[p+1]); G_RecordDemo (myargv[p+1]);
autostart = true; autostart = true;
} }
p = M_CheckParm ("-playdemo"); p = M_CheckParm ("-playdemo");
if (p && p < myargc-1) if (p && p < myargc-1)
{ {
@ -1156,14 +1156,14 @@ void D_DoomMain (void)
G_DeferedPlayDemo (myargv[p+1]); G_DeferedPlayDemo (myargv[p+1]);
D_DoomLoop (); // never returns D_DoomLoop (); // never returns
} }
p = M_CheckParm ("-timedemo"); p = M_CheckParm ("-timedemo");
if (p && p < myargc-1) if (p && p < myargc-1)
{ {
G_TimeDemo (myargv[p+1]); G_TimeDemo (myargv[p+1]);
D_DoomLoop (); // never returns D_DoomLoop (); // never returns
} }
p = M_CheckParm ("-loadgame"); p = M_CheckParm ("-loadgame");
if (p && p < myargc-1) if (p && p < myargc-1)
{ {
@ -1173,7 +1173,7 @@ void D_DoomMain (void)
sprintf(file, "doomsav%c.dsg",myargv[p+1][0]); sprintf(file, "doomsav%c.dsg",myargv[p+1][0]);
G_LoadGame (file); G_LoadGame (file);
} }
if ( gameaction != ga_loadgame ) if ( gameaction != ga_loadgame )
{ {