diff options
| author | Christopher Page | 2008-07-14 00:10:09 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-14 00:10:09 +0000 |
| commit | d2e8d4831e33f9e1c63d53c9dd615a15f67ab995 (patch) | |
| tree | 308cc8bb9ab0bc80d006c84b8ff84267355cedcb /engines/m4/globals.h | |
| parent | 3ac3e84ecffa967f02eeb497e260a0de08e3d2e7 (diff) | |
| parent | ef95c6ff70c1b428ab1d086a9b0b551fc82c8451 (diff) | |
| download | scummvm-rg350-d2e8d4831e33f9e1c63d53c9dd615a15f67ab995.tar.gz scummvm-rg350-d2e8d4831e33f9e1c63d53c9dd615a15f67ab995.tar.bz2 scummvm-rg350-d2e8d4831e33f9e1c63d53c9dd615a15f67ab995.zip | |
Merged revisions 32744-32745,32747,32750-32759,32762-32764,32769,32777,32783,32785-32786,32789-32791,32798-32799,32801-32807,32809-32812,32816-32817,32819-32821,32823-32830,32832-32836,32838-32844,32846-32850,32852-32854,32858-32859,32865-32868,32873-32874,32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33051
Diffstat (limited to 'engines/m4/globals.h')
| -rw-r--r-- | engines/m4/globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/m4/globals.h b/engines/m4/globals.h index a0133db2d6..a80e8bf710 100644 --- a/engines/m4/globals.h +++ b/engines/m4/globals.h @@ -177,7 +177,7 @@ public: void loadMadsMessagesInfo(); uint32 getMessagesSize() { return _madsMessages.size(); } - char* loadMessage(uint32 index); + char* loadMessage(uint index); }; #define PLAYER_FIELD_LENGTH 40 |