diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 22:27:41 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-19 22:27:41 +0200 |
| commit | fec0028e12fb7e362344cfc07d7dcb6b07c29e04 (patch) | |
| tree | 675e1d491bd8f9cb80c707fbba45ae41005a4d31 /src/core | |
| parent | slightly restructured ped flags for convenience (diff) | |
| parent | Merge pull request #567 from erorcun/miami (diff) | |
| download | re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.gz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.bz2 re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.lz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.xz re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.tar.zst re3-fec0028e12fb7e362344cfc07d7dcb6b07c29e04.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/EventList.h | 6 | ||||
| -rw-r--r-- | src/core/Streaming.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/EventList.h b/src/core/EventList.h index 8840afc4..f2c3d7a8 100644 --- a/src/core/EventList.h +++ b/src/core/EventList.h @@ -22,10 +22,12 @@ enum eEventType EVENT_PED_SET_ON_FIRE, EVENT_COP_SET_ON_FIRE, EVENT_CAR_SET_ON_FIRE, - EVENT_ASSAULT_NASTYWEAPON, // not sure + EVENT_ASSAULT_NASTYWEAPON, + EVENT_ASSAULT_NASTYWEAPON_POLICE, EVENT_ICECREAM, EVENT_ATM, - EVENT_SHOPSTALL, // used on graffitis + EVENT_SHOPSTALL, + EVENT_SHOPWINDOW, EVENT_LAST_EVENT }; diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index 09d5cc72..0ce8b50e 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -1337,8 +1337,7 @@ CStreaming::LoadInitialPeds(void) void CStreaming::LoadInitialWeapons(void) { - // TODO(Miami): Enable when weapons have been ported - //CStreaming::RequestModel(MI_NIGHTSTICK, STREAMFLAGS_DONT_REMOVE); + CStreaming::RequestModel(MI_NIGHTSTICK, STREAMFLAGS_DONT_REMOVE); CStreaming::RequestModel(MI_MISSILE, STREAMFLAGS_DONT_REMOVE); } |