From: K.Ohta Date: Mon, 2 Mar 2015 20:00:47 +0000 (+0900) Subject: [BUG][VM][Qt] upd765a.h : Fix wrapper functions for Qt/Agar/SDL. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f2762ba504f31f376e908bdc03d4b3f31b6e6ceb;p=csp-qt%2Fcommon_source_project-fm7.git [BUG][VM][Qt] upd765a.h : Fix wrapper functions for Qt/Agar/SDL. --- diff --git a/source/src/vm/upd765a.h b/source/src/vm/upd765a.h index 14b142b4b..657eef5f9 100644 --- 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; }