aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/platform/n64/Makefile2
-rw-r--r--backends/platform/n64/osys_n64.h1
-rw-r--r--backends/platform/n64/osys_n64_events.cpp4
3 files changed, 3 insertions, 4 deletions
diff --git a/backends/platform/n64/Makefile b/backends/platform/n64/Makefile
index 1f17c148b2..dcf95ff0d3 100644
--- a/backends/platform/n64/Makefile
+++ b/backends/platform/n64/Makefile
@@ -34,7 +34,7 @@ endif
LIBS += -lm -lstdc++ -lc -lgcc -lz -lnosys
-CXXFLAGS = -g -O2 -fomit-frame-pointer -march=vr4300 -mtune=vr4300 -mno-extern-sdata -fno-rtti -fno-exceptions -Wno-multichar -Wshadow -I$(LIBN64PATH) -I$(TOOLPATH)/include -I./ -I$(srcdir) -I$(srcdir)/engines
+CXXFLAGS = -g -mno-extern-sdata -O2 -fomit-frame-pointer -march=vr4300 -mtune=vr4300 -fno-rtti -fno-exceptions -Wno-multichar -Wshadow -I$(LIBN64PATH) -I$(TOOLPATH)/include -I./ -I$(srcdir) -I$(srcdir)/engines
LDFLAGS = -g -march=vr4300 -mtune=vr4300 -nodefaultlibs -nostartfiles -mno-crt0 -L$(LIBN64PATH) -L$(TOOLPATH)/lib $(LIBS) -T n64ld_cpp.x -Xlinker -Map -Xlinker scummvm.map
TARGET = scummvm
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index e6c64cb365..881533fc87 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -196,7 +196,6 @@ public:
void switchGraphicModeId(int mode);
void setupMixer(void);
-
};
#endif /* __OSYS_N64_H__ */
diff --git a/backends/platform/n64/osys_n64_events.cpp b/backends/platform/n64/osys_n64_events.cpp
index 3cda46ce5c..13d04888cb 100644
--- a/backends/platform/n64/osys_n64_events.cpp
+++ b/backends/platform/n64/osys_n64_events.cpp
@@ -208,10 +208,10 @@ bool OSystem_N64::pollEvent(Common::Event &event) {
}
if (abs(analogX) > PAD_DEADZONE)
- mx += analogX / (PAD_ACCELERATION - (abs(analogX) / 20));
+ mx += analogX / (PAD_ACCELERATION - (abs(analogX) / 16));
if (abs(analogY) > PAD_DEADZONE)
- my -= analogY / (PAD_ACCELERATION - (abs(analogY) / 20));
+ my -= analogY / (PAD_ACCELERATION - (abs(analogY) / 16));
if (mx < 0)
mx = 0;