diff options
| author | _AG <gennariarmando@outlook.com> | 2019-07-02 13:59:19 +0200 |
|---|---|---|
| committer | _AG <gennariarmando@outlook.com> | 2019-07-02 14:36:40 +0200 |
| commit | 6c693e3bbfe46cb445e4664eb91ef85c811a6240 (patch) | |
| tree | d088600e9f1a18be005476d7a43a7232ccd1764f /src/main.cpp | |
| parent | Merge pull request #86 from erorcun/erorcun (diff) | |
| download | re3-6c693e3bbfe46cb445e4664eb91ef85c811a6240.tar re3-6c693e3bbfe46cb445e4664eb91ef85c811a6240.tar.gz re3-6c693e3bbfe46cb445e4664eb91ef85c811a6240.tar.bz2 re3-6c693e3bbfe46cb445e4664eb91ef85c811a6240.tar.lz re3-6c693e3bbfe46cb445e4664eb91ef85c811a6240.tar.xz re3-6c693e3bbfe46cb445e4664eb91ef85c811a6240.tar.zst re3-6c693e3bbfe46cb445e4664eb91ef85c811a6240.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 307d0b66..a00447ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -341,7 +341,11 @@ Render2dStuff(void) firstPersonWeapon = true; // Draw black border for sniper and rocket launcher +#ifndef NO_ROCKET_BORDERS if((weaponType == WEAPONTYPE_SNIPERRIFLE || weaponType == WEAPONTYPE_ROCKETLAUNCHER) && firstPersonWeapon){ +#else + if (weaponType == WEAPONTYPE_SNIPERRIFLE && firstPersonWeapon) { +#endif CRGBA black(0, 0, 0, 255); // top and bottom strips @@ -357,6 +361,7 @@ Render2dStuff(void) CSprite2d::DrawRect(CRect(SCREENW / 2 + SCREEN_SCALE_X(210), 0.0f, SCREENW, SCREENH), black); } + MusicManager.DisplayRadioStationName(); // TheConsole.Display(); /* @@ -782,7 +787,7 @@ AppEventHandler(RsEvent event, void *param) { CameraSize(Scene.camera, (RwRect *)param, - DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO); + DEFAULT_VIEWWINDOW, SCREEN_ASPECT_RATIO); return rsEVENTPROCESSED; } |