Willem Jan Palenstijn
02c5cc75a7
Merge branch 'master'
...
Conflicts:
configure
base/plugins.cpp
2013-05-08 20:46:44 +02:00
johndoe123
1539023834
NEVERHOOD: Use constants for the numbers in get/setGlobalVar
...
Now the code is much more readable
- Still TODO is to do the same with get/setSubVar
2013-05-08 20:44:40 +02:00
johndoe123
97ee348c2a
NEVERHOOD: Rename stuff in DiskplayerScene
...
- Add SmackerPlayer::isDone()
- Fix puzzle key variable handling
- Update globalvars.txt
2013-05-08 20:44:40 +02:00
johndoe123
fd13b546a7
NEVERHOOD: Rename stuff in the Scene class and clean up a little
...
- Try to stay close to the actual frame rate
- Also use the Smacker frame rate when a video is playing to
keep videos in sync with the audio
2013-05-08 20:44:40 +02:00
johndoe123
59901c5d13
NEVERHOOD: Rename stuff in Module3000
...
- Also change Scene1609::testVars
- Update globalvars.txt
2013-05-08 20:44:40 +02:00
johndoe123
016638bd9e
NEVERHOOD: Rename stuff in Module2700
...
- Also fix the clipRect in Scene2701
2013-05-08 20:44:40 +02:00
johndoe123
5aee04b127
NEVERHOOD: Work on Module2800:
...
- Rename KmScene2803b to KmScene2803Small; Scene2803b to Scene2803Small
- Rename lots of stuff
2013-05-08 20:44:40 +02:00
johndoe123
fcbab80507
NEVERHOOD: Rename stuff in Module2700 (also in Module2500 which uses some of it)
2013-05-08 20:44:40 +02:00
johndoe123
1da6b95af9
NEVERHOOD: Work on Module2500:
...
- Remove Class541 and Class542 and instead use AsCommonIdleCarLower and AsCommonIdleCarFull
- Some renaming
2013-05-08 20:44:39 +02:00
johndoe123
4c421a09c8
NEVERHOOD: Add clipRects to all Klayman subclasses
...
- Rename stuff in Module2400
- Move some temp sprites from class scope to local scope in the respective constructors
2013-05-08 20:44:39 +02:00
johndoe123
483d76d635
NEVERHOOD: Enable/fixup navigation scene sound update code in several modules
...
- Rename some NavigationScene stuff
2013-05-08 20:44:39 +02:00
johndoe123
9b7bb71dd9
NEVERHOOD: Simplify code and rename things
...
- Add Module::createStaticScene to simplify creation of static scenes
(and use it in the relevant places)
- Rename Class545 to AsCommonKey and rename related variables
- Rename stuff in Module2200
2013-05-08 20:43:48 +02:00
johndoe123
15cfb9f787
NEVERHOOD: Implement clipping against multiple clipRects, used only in several scenes for the Klayman sprite.
...
Currently only implemented in KmScene2201 for testing.
2013-05-08 20:43:48 +02:00
johndoe123
8a9ca493b6
NEVERHOOD: Rename stuff in several modules
2013-05-08 20:43:48 +02:00
johndoe123
2fa76ccca1
NEVERHOOD: Work on Module1700:
...
- Rename stuff
- Add puzzle var initialization in Scene1705
2013-05-08 20:43:47 +02:00
johndoe123
b320c9f5a0
NEVERHOOD: Work on Module1600:
...
- Rename stuff (also in related files)
2013-05-08 20:43:47 +02:00
johndoe123
cb5ca83578
NEVERHOOD: Rename more stuff in Module1400; also fix some bugs
...
- Update globalvars.txt
2013-05-08 20:43:47 +02:00
johndoe123
39d1982e47
NEVERHOOD: Work on Module1400:
...
- Rename stuff
- Fix some bugs (mistyped message numbers...)
- More to come
2013-05-08 20:43:47 +02:00
johndoe123
eefa175a2f
NEVERHOOD: Update todo.txt
2013-05-08 20:43:47 +02:00
johndoe123
106ec42124
NEVERHOOD: Work on Module1300:
...
- Remove Class595, only used for setting the surface priority via a message
- Rename stuff and fix some errors
2013-05-08 20:43:47 +02:00
johndoe123
7b0b3000a7
NEVERHOOD: Rename stuff in Module1200
...
- Remove unused countdowns/code in AsScene1201Creature
- Fix AudioResourceMan::isSoundPlaying
2013-05-08 20:43:47 +02:00
johndoe123
f77b12cf96
NEVERHOOD: Rename stuff in Module1200
...
- Fix Scene1201 (tnt man, match)
2013-05-08 20:43:47 +02:00
johndoe123
5e08ab3e3f
NEVERHOOD: Rename Class426 to SsCommonPressButton
2013-05-08 20:43:47 +02:00
johndoe123
81667d492a
NEVERHOOD: Remove SsScene1002LadderArch and Class599 and turn them into static sprites; the classes were only used to set the sprite surface priority with a message, which is now handled in the scene
2013-05-08 20:43:46 +02:00
johndoe123
c88fdc34dd
NEVERHOOD: Rename Class152 to StaticScene
2013-05-08 20:43:46 +02:00
johndoe123
bb4bda7404
NEVERHOOD: More minor Klayman changes:
...
- Normalize the calling order of the Set... macros
- Actually use _walkResumeFrameIncr, change stStartWalkingResume
2013-05-08 20:43:46 +02:00
johndoe123
debc7e953d
NEVERHOOD: More changes to the Klayman class:
...
- Rename some stuff
- Reorder methods (in the Klayman header only until I'm happy with it :)
2013-05-08 20:43:46 +02:00
johndoe123
3ef691f1af
NEVERHOOD: Rename
...
- Also fix compilation (oops)
2013-05-08 20:43:46 +02:00
johndoe123
4fef1ac9f2
NEVERHOOD: Some more merging and renaming in the Klayman class
2013-05-08 20:43:46 +02:00
johndoe123
22cfd04b12
NEVERHOOD: Rename handleMessage41D640
2013-05-08 20:43:46 +02:00
johndoe123
7e4faf3505
NEVERHOOD: More Klayman merging
...
- Also clean up parameter list of two Klayman subclass constructors and send a message to the parent class instead of operating on the entities inside the Klayman class
2013-05-08 20:43:46 +02:00
johndoe123
e97bd30682
NEVERHOOD: Change sound stuff in Klayman
...
- Also merge some more code into the Klayman class
- Rename hmInsertDiskSide to hmInsertKey (also related code)
2013-05-08 20:43:46 +02:00
johndoe123
acdc0256bb
NEVERHOOD: Change sound stuff in DiskplayerScene
2013-05-08 20:43:45 +02:00
johndoe123
1b3a686cac
NEVERHOOD: Fix AsScene3011Symbol
2013-05-08 20:43:45 +02:00
johndoe123
45da15adce
NEVERHOOD: Change sound stuff in Module3000 (dirty, TODO)
2013-05-08 20:43:45 +02:00
johndoe123
eca881bd3e
NEVERHOOD: Change sound stuff in Module2800
2013-05-08 20:43:45 +02:00
johndoe123
73f4e4bcac
NEVERHOOD: Change sound stuff in Module2700
2013-05-08 20:43:45 +02:00
johndoe123
26188a3a69
NEVERHOOD: Change sound stuff in Module2600
2013-05-08 20:43:45 +02:00
johndoe123
fb9d9c30e6
NEVERHOOD: Change sound stuff in Module2500
2013-05-08 20:43:45 +02:00
johndoe123
0c5a5b3c62
NEVERHOOD: Change sound stuff in Module2400
2013-05-08 20:43:45 +02:00
johndoe123
3651d982c4
NEVERHOOD: Change sound stuff in Module2200
...
- Add Entity::stopSound
2013-05-08 20:43:45 +02:00
johndoe123
78df19c648
NEVERHOOD: Change sound stuff in Module2100
2013-05-08 20:43:45 +02:00
johndoe123
a8dda6c5b6
NEVERHOOD: Change sound stuff in Module1900
2013-05-08 20:43:44 +02:00
johndoe123
0a1a228a88
NEVERHOOD: Change sound stuff in Module1700
...
- Add Entity::setSoundVolume
2013-05-08 20:43:44 +02:00
johndoe123
0c272631df
NEVERHOOD: Change sound stuff in Module1600
2013-05-08 20:43:44 +02:00
johndoe123
2df0a0a2e1
NEVERHOOD: Change sound stuff in Module1500
2013-05-08 20:43:44 +02:00
johndoe123
b119efd5ed
NEVERHOOD: Change sound stuff in Module1400
2013-05-08 20:43:44 +02:00
johndoe123
5ab4eb6555
NEVERHOOD: Change sound stuff in Module1300
...
- Also fix a very stupid bug in AsScene1307Key which messed up the key moving animation
2013-05-08 20:43:44 +02:00
johndoe123
fc359abd08
NEVERHOOD: Change sound stuff in Module1200
2013-05-08 20:43:44 +02:00
johndoe123
7adc1d312e
NEVERHOOD: Change sound stuff in Module1100
...
- Implement Entity::isSoundPlaying
2013-05-08 20:43:44 +02:00