From f47e29d60dccfbee1be420fa61f9ae098da67ca0 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Tue, 16 Jul 2019 12:20:48 +0200 Subject: [PATCH 1/3] multi: rename InitNewSeed to DTypeFromDLvl --- Source/multi.cpp | 12 ++++++------ Source/multi.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/multi.cpp b/Source/multi.cpp index 051442e40..67083cc20 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -727,7 +727,7 @@ BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram) for (i = 0; i < 17; i++) { glSeedTbl[i] = GetRndSeed(); - gnLevelTypeTbl[i] = InitNewSeed(i); + gnLevelTypeTbl[i] = DTypeFromDLvl(i); } if (!SNetGetGameInfo(GAMEINFO_NAME, szPlayerName, 128, &len)) nthread_terminate_game("SNetGetGameInfo1"); @@ -751,15 +751,15 @@ void multi_send_pinfo(int pnum, char cmd) dthread_send_delta(pnum, cmd, &pkplr, sizeof(pkplr)); } -int InitNewSeed(int newseed) +int DTypeFromDLvl(int dlvl) { - if (newseed == 0) + if (dlvl == 0) return 0; - if (newseed >= 1 && newseed <= 4) + if (dlvl >= 1 && dlvl <= 4) return 1; - if (newseed >= 5 && newseed <= 8) + if (dlvl >= 5 && dlvl <= 8) return 2; - if (newseed >= 9 && newseed <= 12) + if (dlvl >= 9 && dlvl <= 12) return 3; return 4; diff --git a/Source/multi.h b/Source/multi.h index 7449a097b..a8782d10f 100644 --- a/Source/multi.h +++ b/Source/multi.h @@ -48,7 +48,7 @@ void __stdcall multi_handle_events(_SNETEVENT *pEvt); BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram); void buffer_init(TBuffer *pBuf); void multi_send_pinfo(int pnum, char cmd); -int InitNewSeed(int newseed); +int DTypeFromDLvl(int dlvl); void SetupLocalCoords(); 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); From 98ac9ebaf36725ee312675c88fc33865965dbaa3 Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Tue, 16 Jul 2019 14:10:40 +0200 Subject: [PATCH 2/3] multi: use name from PSX for InitLevelType --- Source/multi.cpp | 10 +++++----- Source/multi.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/multi.cpp b/Source/multi.cpp index 67083cc20..c25c219a0 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -751,15 +751,15 @@ void multi_send_pinfo(int pnum, char cmd) dthread_send_delta(pnum, cmd, &pkplr, sizeof(pkplr)); } -int DTypeFromDLvl(int dlvl) +int InitLevelType(int l) { - if (dlvl == 0) + if (l == 0) return 0; - if (dlvl >= 1 && dlvl <= 4) + if (l >= 1 && l <= 4) return 1; - if (dlvl >= 5 && dlvl <= 8) + if (l >= 5 && l <= 8) return 2; - if (dlvl >= 9 && dlvl <= 12) + if (l >= 9 && l <= 12) return 3; return 4; diff --git a/Source/multi.h b/Source/multi.h index a8782d10f..5766fbe4e 100644 --- a/Source/multi.h +++ b/Source/multi.h @@ -48,7 +48,7 @@ void __stdcall multi_handle_events(_SNETEVENT *pEvt); BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram); void buffer_init(TBuffer *pBuf); void multi_send_pinfo(int pnum, char cmd); -int DTypeFromDLvl(int dlvl); +int InitLevelType(int l); void SetupLocalCoords(); 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); From 9b6e8668787ec861005c11edc14cf239646299ca Mon Sep 17 00:00:00 2001 From: Robin Eklind Date: Tue, 16 Jul 2019 22:38:59 +0200 Subject: [PATCH 3/3] Update Source/multi.cpp Co-Authored-By: Anders Jenbo --- Source/multi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/multi.cpp b/Source/multi.cpp index c25c219a0..3033ce1be 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -727,7 +727,7 @@ BOOL NetInit(BOOL bSinglePlayer, BOOL *pfExitProgram) for (i = 0; i < 17; i++) { glSeedTbl[i] = GetRndSeed(); - gnLevelTypeTbl[i] = DTypeFromDLvl(i); + gnLevelTypeTbl[i] = InitLevelType(i); } if (!SNetGetGameInfo(GAMEINFO_NAME, szPlayerName, 128, &len)) nthread_terminate_game("SNetGetGameInfo1");