Willem Jan Palenstijn
01f3f3a8dd
Merge branch 'master'
2013-05-08 20:39:44 +02:00
johndoe123
9cf2c83e5e
NEVERHOOD: Major renaming:
...
- Give better names to animation callback functions/vars
- Give better names to animation functions (previously known as subXXXX - not completed yet)
- Add dumpAllResources (which is a lie, since it only dumps animations for now)
- More renaming to come
2013-05-08 20:39:43 +02:00
johndoe123
023c36f2b6
NEVERHOOD: Add Class437 (still needs renaming, of course :)
2013-05-08 20:39:43 +02:00
johndoe123
c56c93f085
NEVERHOOD: Add Scene2702 (needs cleanup)
2013-05-08 20:39:43 +02:00
johndoe123
6315ccb552
NEVERHOOD: Add tables for Scene2702
2013-05-08 20:39:42 +02:00
johndoe123
d276e7ceaa
NEVERHOOD: Add Scene2701
2013-05-08 20:39:42 +02:00
johndoe123
31b3dec8c9
NEVERHOOD: More tables for Module2700
2013-05-08 20:39:42 +02:00
johndoe123
463039c406
NEVERHOOD: Add Scene2706
...
- Move calcDistance from Class521 to graphics.cpp
2013-05-08 20:39:42 +02:00
johndoe123
aa789ee02b
NEVERHOOD: More work in Module2700
2013-05-08 20:39:42 +02:00
johndoe123
e7673ffdc6
NEVERHOOD: Updated dat
2013-05-08 20:39:42 +02:00
johndoe123
ee1bf85456
NEVERHOOD: Add new SceneInfo2700 structure and some tables using it for Module2700
2013-05-08 20:39:42 +02:00
johndoe123
770689b2f1
NEVERHOOD: Start with Module2700 (doesn't do anything yet)
2013-05-08 20:39:42 +02:00
johndoe123
28be9f6f4b
NEVERHOOD: Add Scene2609 and hook Module2600 to the GameModule
2013-05-08 20:39:42 +02:00
johndoe123
9f599a7dfc
NEVERHOOD: Start with Module2600 (missing Scene2609)
2013-05-08 20:39:42 +02:00
johndoe123
8840c74819
NEVERHOOD: Add floor button to Scene1401
2013-05-08 20:39:41 +02:00
johndoe123
a7dcbd0f33
NEVERHOOD: Add floor button ("Class429") to Scene2101
2013-05-08 20:39:41 +02:00
johndoe123
21ebcf2af2
NEVERHOOD: Add Module2100 and Scene2101 (not complete yet)
2013-05-08 20:39:41 +02:00
johndoe123
ced4efc66f
NEVERHOOD: Add tables for Scene2101
2013-05-08 20:39:41 +02:00
johndoe123
729e3ae26e
NEVERHOOD: Add tables for Scene1901
2013-05-08 20:39:41 +02:00
johndoe123
7a0a0c4b65
NEVERHOOD: Add Module1900 and Scene1901, Scene1907
...
(Scene1908 is actually only used in another module...)
2013-05-08 20:39:41 +02:00
johndoe123
2275141d56
NEVERHOOD: Add Scene1609
...
- Use Scene::insertSprite<> in all scenes
2013-05-08 20:39:41 +02:00
johndoe123
af2820fd23
NEVERHOOD: Add leaveModule and leaveScene
...
(instead of using sendMessage directly)
2013-05-08 20:39:41 +02:00
johndoe123
236ca705e8
NEVERHOOD: Add Module1600 and Scene1608 (stuff will be renamed later)
2013-05-08 20:39:41 +02:00
johndoe123
2445e6aba8
NEVERHOOD: Add tables for Module1600 and Scene1608
2013-05-08 20:39:41 +02:00
johndoe123
47f1fe141b
NEVERHOOD: Add Scene1109
...
- Also fix some bugs regarding a missing parameter to setMessageList in various scenes
2013-05-08 20:39:40 +02:00
johndoe123
8a08287e7b
NEVERHOOD: Add tables for Scene1109
2013-05-08 20:39:40 +02:00
johndoe123
95cfa04e3b
NEVERHOOD: Add tables for Scene1105
2013-05-08 20:39:40 +02:00
johndoe123
3872efe2a5
NEVERHOOD: Start with Module1100 and add Scene1105
2013-05-08 20:39:40 +02:00
johndoe123
abf78e07ee
NEVERHOOD: Replace InsertKlayman macros with template functions (still weird but nicer)
2013-05-08 20:39:40 +02:00
johndoe123
9aff6337bc
NEVERHOOD: Try to cleanup sprite creation with a templated insertSprite function (only in Module1000 so far)
2013-05-08 20:39:40 +02:00
johndoe123
1b2d496d18
NEVERHOOD: Try to clean up the clipRect stuff a little
2013-05-08 20:39:40 +02:00
johndoe123
2f670690bc
NEVERHOOD: Add Scene::setPalette for simpled palette creation and use it
2013-05-08 20:39:40 +02:00
johndoe123
fa695229be
NEVERHOOD: Add Sprite::setVisible and use it instead of direct access to the surface member
2013-05-08 20:39:40 +02:00
johndoe123
10ff159030
NEVERHOOD: Move createModuleXXX/updateModuleXXX methods
...
There are merged into createModule and updateModule in the GameModule class
2013-05-08 20:39:40 +02:00
johndoe123
17ad070a9c
NEVERHOOD: Move createSceneXXX/updateSceneXXX methods
...
They are merged into createScene and updateScene for the other already
implemented modules (I hope I didn't break too much :)
2013-05-08 20:39:39 +02:00
johndoe123
a4c34cedd5
NEVERHOOD: Merge createSceneXXX/updateSceneXXX methods into createScene and updateScene for Module1200
2013-05-08 20:39:39 +02:00
johndoe123
0ec039c5b0
NEVERHOOD: Merge the three mouse classes into Mouse, introduce insertMouse433 etc. methods and use them
2013-05-08 20:39:39 +02:00
johndoe123
71ea4d5877
NEVERHOOD: Merge Palette2 class into Palette
2013-05-08 20:39:39 +02:00
johndoe123
d24907d1bb
NEVERHOOD: Rename Palette2::addPalette to addBasePalette to prepare the merge of the Palette/Palette2 classes
2013-05-08 20:39:39 +02:00
johndoe123
67fe73352b
NEVERHOOD: Merge createSceneXXX/updateSceneXXX methods into createScene and updateScene for Module1000
2013-05-08 20:39:39 +02:00
johndoe123
02fe0bc65d
NEVERHOOD: Merge scene-specific createSceneXXX/updateSceneXXX methods into createScene and updateScene (for Module2200 only so far)
2013-05-08 20:39:39 +02:00
johndoe123
fad64afa44
NEVERHOOD: Remove unused resource preloading stuff (probably resource preloading is not needed since the original game ran off slow double/quad-speed cd drives and preloading reduced stuttering while playing back then)
...
- Add Klayman animation speedup
2013-05-08 20:39:39 +02:00
johndoe123
c30e16628e
NEVERHOOD: Add Module::updateChild and use it (in most places)
2013-05-08 20:39:39 +02:00
johndoe123
5d63bef6a2
NEVERHOOD: Use setBackground
2013-05-08 20:39:39 +02:00
johndoe123
4a88ce37dd
NEVERHOOD: Use InsertKlayman
2013-05-08 20:39:38 +02:00
johndoe123
cac9a090e7
NEVERHOOD: Use insertStaticSprite
2013-05-08 20:39:38 +02:00
johndoe123
b757e22f88
NEVERHOOD: Multiple changes to make the game logic code cleaner (hopefully :)
...
- Introduce Scene::insertStaticSprite to create static sprites instead of the old "addSprite(new StaticSprite" (not used everywhere yet)
- Introduce macro InsertKlayman to create the Klayman object
- Change sendMessage semantics from "receiver->sendMessage(num,arg,sender)" to "sendMessage(receiver,num,arg)", the sender is always the sending object ("this")
- Similar changes using macros will follow
- And fixed a bug in the elevator
2013-05-08 20:39:38 +02:00
johndoe123
a21f9ef891
NEVERHOOD: Add Scene1310 and Scene1311
2013-05-08 20:39:38 +02:00
johndoe123
38378d2090
NEVERHOOD: Add Scene1317
...
- Fix SmackerPlayer (last frame was dropped, this hopefully doesn't break other stuff...)
2013-05-08 20:39:38 +02:00
johndoe123
3e122b002c
NEVERHOOD: Add Scene1308 (renaming of stuff todo)
2013-05-08 20:39:38 +02:00