Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make difficulty work when you start the campaign with the --game parameter. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5076 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-05-12 17:50:10 +00:00
parent 7caf01c08f
commit 1819c503c6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/netplay/netplay.c
View File

@ -505,8 +505,6 @@ int NETinit(BOOL bFirstCall)
NetPlay.dpidPlayer = 0; NetPlay.dpidPlayer = 0;
NetPlay.bHost = 0; NetPlay.bHost = 0;
NetPlay.bComms = true;
for(i = 0; i < MAX_PLAYERS; i++) for(i = 0; i < MAX_PLAYERS; i++)
{ {
memset(&NetPlay.players[i], 0, sizeof(NetPlay.players[i])); memset(&NetPlay.players[i], 0, sizeof(NetPlay.players[i]));

2
src/clparse.c
View File

@ -32,6 +32,7 @@
#include "frontend.h" #include "frontend.h"
#include "lib/ivis_common/pieclip.h" #include "lib/ivis_common/pieclip.h"
#include "lib/netplay/netplay.h"
#include "warzoneconfig.h" #include "warzoneconfig.h"
#include "clparse.h" #include "clparse.h"
@ -319,6 +320,7 @@ bool ParseCommandLine(int argc, const char** argv)
fprintf(stderr, "\tCAM_1A\n\tCAM_2A\n\tCAM_3A\n\tTUTORIAL3\n\tFASTPLAY\n"); fprintf(stderr, "\tCAM_1A\n\tCAM_2A\n\tCAM_3A\n\tTUTORIAL3\n\tFASTPLAY\n");
exit(1); exit(1);
} }
NetPlay.bComms = false;
sstrcpy(aLevelName, token); sstrcpy(aLevelName, token);
SetGameMode(GS_NORMAL); SetGameMode(GS_NORMAL);
break; break;

4
src/main.c
View File

@ -890,6 +890,8 @@ int main(int argc, char *argv[])
atexit( closeConfig ); atexit( closeConfig );
loadRenderMode(); //get the registry entry for clRendMode loadRenderMode(); //get the registry entry for clRendMode
NETinit(true);
// parse the command line // parse the command line
if (!ParseCommandLine(argc, (const char**)argv)) { if (!ParseCommandLine(argc, (const char**)argv)) {
return -1; return -1;
@ -905,8 +907,6 @@ int main(int argc, char *argv[])
// SQLite's VFS system as the default (non-zero=default, zero=default). // SQLite's VFS system as the default (non-zero=default, zero=default).
sqlite3_register_physfs_vfs(1); sqlite3_register_physfs_vfs(1);
NETinit(true);
if (!frameInitialise( "Warzone 2100", pie_GetVideoBufferWidth(), pie_GetVideoBufferHeight(), pie_GetVideoBufferDepth(), war_getFullscreen() )) if (!frameInitialise( "Warzone 2100", pie_GetVideoBufferWidth(), pie_GetVideoBufferHeight(), pie_GetVideoBufferDepth(), war_getFullscreen() ))
{ {
return -1; return -1;