summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authoraap <angelo.papenhoff@gmail.com>2019-07-02 22:05:11 +0200
committerGitHub <noreply@github.com>2019-07-02 22:05:11 +0200
commite8215cf560318fdd77817cea485af50fca827552 (patch)
tree477b9853bea245d9cbdaa8700e02ff980abe79d5 /src/main.cpp
parentMerge pull request #88 from gennariarmando/master (diff)
downloadre3-e8215cf560318fdd77817cea485af50fca827552.tar
re3-e8215cf560318fdd77817cea485af50fca827552.tar.gz
re3-e8215cf560318fdd77817cea485af50fca827552.tar.bz2
re3-e8215cf560318fdd77817cea485af50fca827552.tar.lz
re3-e8215cf560318fdd77817cea485af50fca827552.tar.xz
re3-e8215cf560318fdd77817cea485af50fca827552.tar.zst
re3-e8215cf560318fdd77817cea485af50fca827552.zip
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp
index a00447ef..307d0b66 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -341,11 +341,7 @@ 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
@@ -361,7 +357,6 @@ Render2dStuff(void)
CSprite2d::DrawRect(CRect(SCREENW / 2 + SCREEN_SCALE_X(210), 0.0f, SCREENW, SCREENH), black);
}
-
MusicManager.DisplayRadioStationName();
// TheConsole.Display();
/*
@@ -787,7 +782,7 @@ AppEventHandler(RsEvent event, void *param)
{
CameraSize(Scene.camera, (RwRect *)param,
- DEFAULT_VIEWWINDOW, SCREEN_ASPECT_RATIO);
+ DEFAULT_VIEWWINDOW, DEFAULT_ASPECTRATIO);
return rsEVENTPROCESSED;
}