Commit Graph

119 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
f2194d595d Merge branch 'master' of github.com:scummvm/scummvm 2015-12-24 20:29:58 +01:00
Willem Jan Palenstijn
0d97d1af82 LAB: Avoid manual memory management of CloseData 2015-12-24 20:28:57 +01:00
Strangerke
c191efa623 LAB: Remove the 3rd parameter of drawMap (always false) 2015-12-24 18:55:10 +01:00
Filippos Karapetis
a5553b3197 Use Common::Keycode and enums in interface buttons 2015-12-24 19:12:02 +02:00
Willem Jan Palenstijn
b614ccc2e8 LAB: Avoid manual memory management in Action lists 2015-12-24 17:42:40 +01:00
Filippos Karapetis
8b45875e24 LAB: Get rid of _screenImage
Thanks to wjp for finding this
2015-12-24 13:00:10 +02:00
Filippos Karapetis
70ec11d260 LAB: Change the direction and map door defines into enums 2015-12-23 22:59:59 +02:00
Willem Jan Palenstijn
10d9d8dee5 LAB: Fix warnings by adding consts 2015-12-23 21:51:39 +01:00
Filippos Karapetis
333d553716 LAB: Add a console, with two new commands (scene and scene_resources) 2015-12-23 21:43:16 +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
46f792d82d LAB: Delete some more variables in LabEngine destructor 2015-12-23 21:35:33 +01:00
Strangerke
6aad3aebd9 LAB: Move some more comments to header files 2015-12-23 21:35:33 +01:00
Strangerke
b53735ba06 LAB: Constify some parameters 2015-12-23 21:35:32 +01:00
Strangerke
28c74aed05 LAB: More work on the comments 2015-12-23 21:35:30 +01:00
Filippos Karapetis
11d16bb34f LAB: Remove some leftover MSVC memory leak tester code 2015-12-23 21:35:29 +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
b3b3c0cfd5 LAB: Remove parameters from processMainButton and performAction 2015-12-23 21:34:09 +01:00
Filippos Karapetis
0004488441 LAB: Simplify decIncInv() and move action handling out of fromCrumbs() 2015-12-23 21:34:09 +01:00
Strangerke
054a7a1e19 LAB: Use Common::Rect in functions related to flowText (WIP) 2015-12-23 21:34:07 +01:00
Filippos Karapetis
005e077551 LAB: Some renames 2015-12-23 21:34:07 +01:00
Strangerke
9c7e372a21 LAB: make takeItem use Common::Point, some refactoring 2015-12-23 21:34:06 +01:00
Filippos Karapetis
521652e436 LAB: Move some code from fromCrumbs() into separate functions
This makes this huge function a bit easier to read and understand
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
Strangerke
a784e2bd5c LAB: Finally get rid of g_lab 2015-12-23 21:34:03 +01:00
Strangerke
974740d307 LAB: Some renaming in LabEngine 2015-12-23 21:34:03 +01:00
Strangerke
ad54a75b85 LAB: Add _vm to Image class 2015-12-23 21:34:03 +01:00
Filippos Karapetis
99e09b2ca2 LAB: Merge the different X image maps 2015-12-23 21:34:03 +01:00
Filippos Karapetis
e994c90d9b LAB: Simplify the crumb wait time code 2015-12-23 21:34:03 +01:00
Filippos Karapetis
2332fb617c LAB: Rename gadget to button 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
577b60d785 LAB: Move getMsg to the event manager 2015-12-23 21:34:02 +01:00
Strangerke
c837e67070 LAB: Move interface functions to EventMan 2015-12-23 21:34:02 +01:00
Strangerke
7efd471a92 LAB: check header define names, rename a parameter of processMonitor() 2015-12-23 21:34:02 +01:00
Strangerke
aef304a83b LAB: Some renaming and refactoring in special.cpp 2015-12-23 21:34:01 +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
f47d41930f LAB: Review LabEngine definition, make private a lot of members 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
Filippos Karapetis
0c0b2da235 LAB: Move some defines which are only used in the tile puzzle 2015-12-23 21:34:00 +01:00
Filippos Karapetis
4fb53ad170 LAB: Some renames, simplified saveGame() and loadGame() 2015-12-23 21:34:00 +01:00
Filippos Karapetis
7d4e71d29e LAB: Change the map floor showing code, when changing floors
This greatly simplifies the code that shows a floor when an arrow is
pressed. Also, it changes the behavior of the arrows to show all of
the visited floors, instead of a specific subset. I believe that this
makes the map better, more usable and less confusing than the original
2015-12-23 21:34:00 +01:00
Filippos Karapetis
8f5c91ee07 LAB: Move all the tile puzzle related functionality into its own class 2015-12-23 21:34:00 +01:00
Strangerke
8e88d31025 LAB: Move processroom functions to LabEngine 2015-12-23 21:33:59 +01:00
Strangerke
2d90f8a08d LAB: Move map function to LabEngine class, some renaming 2015-12-23 21:33:59 +01:00
Strangerke
1e9ee6ef4a LAB: Some refactoring and renaming in map.cpp 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
0af299d3c7 LAB: Move saveRestoreGame() to saveload.cpp 2015-12-23 21:33:58 +01:00
Filippos Karapetis
f137e1af15 LAB: Use a local buffer for moving tiles in the tile puzzle
This fixes the crash when a tile is moved
2015-12-23 21:33:58 +01:00
Eugene Sandulenko
c1fc1687fc LAB: Code naming standards 2015-12-23 21:33:58 +01:00
Eugene Sandulenko
e5f753749f LAB: Reduced dependency on processroom.h. Yay! 2015-12-23 21:33:58 +01:00