Willem Jan Palenstijn
ae519716a2
Merge branch 'master' of github.com:scummvm/scummvm
2015-12-26 14:20:15 +01:00
Willem Jan Palenstijn
01d99d213d
LAB: Reduce passing around of pointers to the near-global _closeDataPtr
2015-12-26 14:18:44 +01:00
Willem Jan Palenstijn
f72de724e9
LAB: Reduce passing around of pointers to the near-global _closeDataPtr
2015-12-26 14:07:46 +01:00
Willem Jan Palenstijn
e3ce65cce8
LAB: Reduce passing around of pointers to the near-global _closeDataPtr
2015-12-26 14:04:39 +01:00
Willem Jan Palenstijn
6daf92cbf4
LAB: Reduce passing around of pointers to the near-global _closeDataPtr
2015-12-26 13:58:07 +01:00
Filippos Karapetis
d1b5d41005
LAB: Clean up sound effect looping, starting and stopping code
2015-12-26 12:45:48 +02:00
Filippos Karapetis
c9b103b2db
LAB: Use friendlier names for lists
2015-12-25 14:12:05 +02:00
Willem Jan Palenstijn
23ace32e09
LAB: Simplify tab handling
2015-12-25 11:20:03 +01:00
Willem Jan Palenstijn
da2074146f
LAB: Make tab behave more logically
...
When skipping to the next closeup, it seems to make little sense to
check the _graphicName of the current one.
2015-12-24 20:28:57 +01:00
Willem Jan Palenstijn
0d97d1af82
LAB: Avoid manual memory management of CloseData
2015-12-24 20:28:57 +01:00
Willem Jan Palenstijn
1a1525a155
LAB: Avoid manual memory management of ViewData
2015-12-24 20:28:57 +01:00
Willem Jan Palenstijn
cd3ebf687c
LAB: Avoid manual memory management of RuleList
2015-12-24 20:28:57 +01:00
Willem Jan Palenstijn
b614ccc2e8
LAB: Avoid manual memory management in Action lists
2015-12-24 17:42:40 +01:00
Filippos Karapetis
35f53bb522
LAB: Error out on unused opcodes
...
This also fixes a warning
2015-12-23 23:07:40 +02:00
Filippos Karapetis
70ec11d260
LAB: Change the direction and map door defines into enums
2015-12-23 22:59:59 +02:00
Filippos Karapetis
29d85c8d50
LAB: Use int in for loops, instead of uint16
2015-12-23 21:43:17 +01:00
Strangerke
34b59256fc
LAB: Replace g_system by _system
2015-12-23 21:43:16 +01:00
Filippos Karapetis
9d53245f73
LAB: Get rid of _waitTillFinished
...
There is no point waiting for looping sound effects to end
2015-12-23 21:43:16 +01:00
Filippos Karapetis
f7395ba0ab
LAB: Rewrite the action message functionality (_doNotShowMessage)
2015-12-23 21:43:16 +01:00
Filippos Karapetis
ced5b677f6
LAB: Add enums for action types, rule types ad rule actions
2015-12-23 21:35:35 +01:00
Filippos Karapetis
f59ccf534c
LAB: Get rid of the _doNotDrawMessage hack (from the original)
...
This is actually a nasty hack in the original to avoid duplicate
messages, but it ended up hiding some game messages. This hack isn't
really necessary at all for game functionality, so it has been
removed, without any notable side-effects
2015-12-23 21:35:35 +01:00
Strangerke
be4c436dca
LAB: Move event update functions out of updateMusic
2015-12-23 21:35:34 +01:00
Strangerke
7380ddf400
LAB: Change RuleList to a Common::List<Rule> as suggested by wjp
2015-12-23 21:35:34 +01:00
Strangerke
137e12bf95
LAB: Fix regression in intro
2015-12-23 21:35:33 +01:00
Strangerke
fa222f0ca8
LAB: Make string check more readable, remove a useless c_str()
2015-12-23 21:35:32 +01:00
Strangerke
cff1f99b26
LAB: Set a default to the second parameter of readPict
2015-12-23 21:35:32 +01:00
Strangerke
4dfc428bac
LAB: Some cleanup and refactoring
2015-12-23 21:35:32 +01:00
Strangerke
feeaf09486
LAB: Use rectScale in two other places
2015-12-23 21:35:32 +01:00
Strangerke
6981d750ea
LAB: Fix a bug pointed out by wjp in getObject
2015-12-23 21:35:31 +01:00
Strangerke
ae9c2fea51
LAB: Replace char* by Common::String in several functions
2015-12-23 21:35:31 +01:00
Strangerke
a4d3bda5c1
LAB: Use an array of Common::Strings instead of bytes in Action
2015-12-23 21:35:31 +01:00
Strangerke
28c74aed05
LAB: More work on the comments
2015-12-23 21:35:30 +01:00
Strangerke
b9326e3850
LAB: Refactor some DispMan functions to use Common::String
2015-12-23 21:35:30 +01:00
Strangerke
7f5826cfcb
LAB: Fix check of ending animation, some renaming
2015-12-23 21:35:30 +01:00
Filippos Karapetis
3e8eaa2c35
LAB: Use Common::String for strings, removing a ton of memory leaks
...
Also, add a method to properly free room views
2015-12-23 21:35:27 +01:00
Strangerke
9c7e372a21
LAB: make takeItem use Common::Point, some refactoring
2015-12-23 21:34:06 +01:00
Strangerke
f791d690b2
LAB: Use Common::Rect in a couple of position checks to make it a bit more readable
2015-12-23 21:34:05 +01:00
Strangerke
21e6f40301
LAB: Fix a regression related to random number generation, some renaming
2015-12-23 21:34:04 +01:00
Filippos Karapetis
2332fb617c
LAB: Rename gadget to button
2015-12-23 21:34:03 +01:00
Filippos Karapetis
1524e20ef1
LAB: Simplify the room doors array
2015-12-23 21:34:03 +01:00
Filippos Karapetis
c883769adc
LAB: Move the LAB2 teaser screen in a separate function
2015-12-23 21:34:03 +01:00
Filippos Karapetis
dffaffdd09
LAB: Simplify calls to initMusic()
2015-12-23 21:34:02 +01:00
Filippos Karapetis
40b16afcab
LAB: Get rid of _unstoppableSoundEffect
...
_loopSoundEffect is used for the exact same purpose
2015-12-23 21:34:02 +01:00
Strangerke
47368c157e
LAB: Review Music declaration, some refactoring and renaming
2015-12-23 21:34:02 +01:00
Filippos Karapetis
1b0a7db0b6
LAB: Get rid of getTime(), readBlock() and getRandom()
...
Also, simplify some time-related functions
2015-12-23 21:34:01 +01:00
Strangerke
7bb45a8eaa
LAB: Move timing functions to the utility class
2015-12-23 21:34:01 +01:00
Strangerke
8e88d31025
LAB: Move processroom functions to LabEngine
2015-12-23 21:33:59 +01:00
Strangerke
199fa254f9
LAB: Rename CloseDataPtr pointers, some refactoring
2015-12-23 21:33:59 +01:00
Eugene Sandulenko
e5f753749f
LAB: Reduced dependency on processroom.h. Yay!
2015-12-23 21:33:58 +01:00
Eugene Sandulenko
9af853b6ab
LAB: Reduced last reducable header: anim.h
2015-12-23 21:33:58 +01:00