diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-07-24 20:00:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 20:00:08 +0200 |
| commit | 81ee1c509a8d05189901dd59c268bf47a6188eb8 (patch) | |
| tree | d836f70678f2ce7b5d86a6745f34b45232ff71d0 /src/skel | |
| parent | update (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.gz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.bz2 re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.lz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.xz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.zst re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/skel/events.cpp | 2 | ||||
| -rw-r--r-- | src/skel/win/win.rc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/skel/events.cpp b/src/skel/events.cpp index 877b969e..60e1482e 100644 --- a/src/skel/events.cpp +++ b/src/skel/events.cpp @@ -775,7 +775,7 @@ HandlePadButtonUp(RsPadButtonStatus *padButtonStatus) bool bCam = false; int16 mode = TheCamera.Cams[TheCamera.ActiveCam].Mode; if ( mode == CCam::MODE_FLYBY || mode == CCam::MODE_FIXED ) - bool bCam = true; + bCam = true; ControlsManager.UpdateJoyButtonState(padNumber); diff --git a/src/skel/win/win.rc b/src/skel/win/win.rc index 051f31ed..676b8ef7 100644 --- a/src/skel/win/win.rc +++ b/src/skel/win/win.rc @@ -4,11 +4,11 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#if !defined(__GNU_C__) -#include "afxres.h" -#else +//#if !defined(__GNU_C__) +//#include "afxres.h" +//#else #include "winresrc.h" -#endif /* !defined(__GNU_C__) */ +//#endif /* !defined(__GNU_C__) */ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS |