OSDN Git Service
(root)
/
csp-qt
/
common_source_project-fm7.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b6ae95f
)
[BUG][VM][Qt] upd765a.h : Fix wrapper functions for Qt/Agar/SDL.
author
K.Ohta
<whatisthis.sowhat@gmail.com>
Mon, 2 Mar 2015 20:00:47 +0000
(
05:00
+0900)
committer
K.Ohta
<whatisthis.sowhat@gmail.com>
Mon, 2 Mar 2015 20:00:47 +0000
(
05:00
+0900)
source/src/vm/upd765a.h
patch
|
blob
|
history
diff --git
a/source/src/vm/upd765a.h
b/source/src/vm/upd765a.h
index
14b142b
..
657eef5
100644
(file)
--- a/
source/src/vm/upd765a.h
+++ b/
source/src/vm/upd765a.h
@@
-119,11
+119,19
@@
private:
void cmd_specify();
void cmd_invalid();
#if defined(_USE_AGAR) || defined(_USE_SDL) || defined(_USE_QT)
-
uint8 __min(uint8 x, uint8
y) {
+
int __min(int x, int
y) {
if(x > y) return y;
return x;
}
- uint8 __max(uint8 x, uint8 y) {
+ int __max(int x, int y) {
+ if(x < y) return y;
+ return x;
+ }
+ int __min(uint8 x, uint8 y) {
+ if(x > y) return y;
+ return x;
+ }
+ int __max(uint8 x, uint8 y) {
if(x < y) return y;
return x;
}