diff options
author | erorcun <erayorcunus@gmail.com> | 2020-03-22 02:50:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-22 02:50:38 +0100 |
commit | 23f2ab5ff168e821c54ff84618bd4a5a12476cd5 (patch) | |
tree | d42b0d0fe6ef7f1b2d68b71ecbc63437d6ab2c4d /src/peds/PedStats.cpp | |
parent | Merge pull request #349 from Nick007J/master (diff) | |
parent | Merge branch 'master' into erorcun (diff) | |
download | re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.gz re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.bz2 re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.lz re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.xz re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.tar.zst re3-23f2ab5ff168e821c54ff84618bd4a5a12476cd5.zip |
Diffstat (limited to 'src/peds/PedStats.cpp')
-rw-r--r-- | src/peds/PedStats.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/peds/PedStats.cpp b/src/peds/PedStats.cpp index c393fddc..147f11e2 100644 --- a/src/peds/PedStats.cpp +++ b/src/peds/PedStats.cpp @@ -4,7 +4,8 @@ #include "FileMgr.h" #include "PedStats.h" -CPedStats *(&CPedStats::ms_apPedStats)[NUM_PEDSTATS] = *(CPedStats *(*)[NUM_PEDSTATS]) *(uintptr*)0x9404D4; +//CPedStats *(&CPedStats::ms_apPedStats)[NUM_PEDSTATS] = *(CPedStats *(*)[NUM_PEDSTATS]) *(uintptr*)0x9404D4; +CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS]; void CPedStats::Initialise(void) @@ -68,9 +69,9 @@ CPedStats::LoadPedStats(void) line[linelen++] = ' '; else line[linelen++] = buf[bp]; - line[linelen] = '\0'; } bp++; + line[linelen] = '\0'; // skip white space for(lp = 0; line[lp] <= ' '; lp++); @@ -107,14 +108,13 @@ CPedStats::LoadPedStats(void) delete[] buf; } -int32 +ePedStats CPedStats::GetPedStatType(char *name) { - int type; - - for(type = 0; type < NUM_PEDSTATS; type++) + for(uint16 type = 0; type < NUM_PEDSTATS; type++) if(!CGeneral::faststrcmp(ms_apPedStats[type]->m_name, name)) - return type; + return (ePedStats) type; + return NUM_PEDSTATS; } |