mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1309 from mewpull/rename-InitNewSeed 

multi: rename InitNewSeed to InitLevelType
pull/197/head
Robin Eklind 7 years ago committed by GitHub
parent
8402bbaff5 9b6e866878
commit
8b85ba2489
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      Source/multi.cpp
  2. 2
      Source/multi.h

12
Source/multi.cpp
Unescape View File

@ -727,7 +727,7 @@ BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram)
for (i = 0; i < 17; i++) { for (i = 0; i < 17; i++) {
glSeedTbl[i] = GetRndSeed(); glSeedTbl[i] = GetRndSeed();
gnLevelTypeTbl[i] = InitNewSeed(i); gnLevelTypeTbl[i] = InitLevelType(i);
} }
if (!SNetGetGameInfo(GAMEINFO_NAME, szPlayerName, 128, &len)) if (!SNetGetGameInfo(GAMEINFO_NAME, szPlayerName, 128, &len))
nthread_terminate_game("SNetGetGameInfo1"); nthread_terminate_game("SNetGetGameInfo1");
@ -751,15 +751,15 @@ void multi_send_pinfo(int pnum, char cmd)
dthread_send_delta(pnum, cmd, &pkplr, sizeof(pkplr)); dthread_send_delta(pnum, cmd, &pkplr, sizeof(pkplr));
} }
int InitNewSeed(int newseed) int InitLevelType(int l)
{ {
if (newseed == 0) if (l == 0)
return 0; return 0;
if (newseed >= 1 && newseed <= 4) if (l >= 1 && l <= 4)
return 1; return 1;
if (newseed >= 5 && newseed <= 8) if (l >= 5 && l <= 8)
return 2; return 2;
if (newseed >= 9 && newseed <= 12) if (l >= 9 && l <= 12)
return 3; return 3;
return 4; return 4;

2
Source/multi.h
Unescape View File

@ -48,7 +48,7 @@ void __stdcall multi_handle_events(_SNETEVENT *pEvt);
BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram); BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram);
void buffer_init(TBuffer *pBuf); void buffer_init(TBuffer *pBuf);
void multi_send_pinfo(int pnum, char cmd); void multi_send_pinfo(int pnum, char cmd);
int InitNewSeed(int newseed); int InitLevelType(int l);
void SetupLocalCoords(); void SetupLocalCoords();
BOOL multi_init_single(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info); BOOL multi_init_single(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info);
BOOL multi_init_multi(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, int *pfExitProgram); BOOL multi_init_multi(_SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, int *pfExitProgram);

Write Preview
Loading…
Cancel
Save