Hmmm... I notice that I already have a compiled version of r117 and r121. I must have rejected both of those builds for some reason. I wonder what they were.
I should have made notes.
I'll have to check. The question is will I be able to spot the problem?
Anyway, I tried modifying my stuff and got this:
Code: Select all
.\src\p_plats.cpp(61) : error C2065: 'CHAN_FLOOR' : undeclared identifier
I think this one is more complex than originally thought. When I search through the more recent code for CHAN_FLOOR, I get this:
[spoiler]
Code: Select all
Searching for: CHAN_FLOOR
src\p_floor.cpp(324): SN_StartSequence (sec, CHAN_FLOOR, sec->seqType, SEQ_PLATFORM, 0);
src\p_floor.cpp(328): SN_StartSequence (sec, CHAN_FLOOR, "Floor", 0);
src\p_pillar.cpp(193): SN_StartSequence (sector, CHAN_FLOOR, sector->seqType, SEQ_PLATFORM, 0);
src\p_pillar.cpp(195): SN_StartSequence (sector, CHAN_FLOOR, "Floor", 0);
src\p_plats.cpp(61): SN_StartSequence (m_Sector, CHAN_FLOOR, m_Sector->seqType, SEQ_PLATFORM, 0);
src\p_plats.cpp(63): SN_StartSequence (m_Sector, CHAN_FLOOR, sound, 0);
src\p_plats.cpp(177): SN_StartSequence (m_Sector, CHAN_FLOOR, "Silence", 0);
src\p_plats.cpp(355): SN_StartSequence (sec, CHAN_FLOOR, "Silence", 0);
src\s_sound.cpp(745): if (channum == CHAN_FLOOR)
src\s_sound.h(250): #define CHAN_FLOOR 1 // Sound comes from the floor.
Found 10 occurrence(s) in 5 file(s)
[/spoiler]
The stuff in p_floor.cpp and p_pillar.cpp looks similar to the stuff for p_plats.cpp so I think I can change that easily enough. However, I have more problems with the other files:
s_sound.cpp has a whole block of stuff in more recent versions than existed in r120 and, frankly, I've no idea what is required.
s_sound.h looked like it should just be a case of adding the define in, but when I checked the newer code, I saw that a whole bunch of other defines had been added:
[spoiler]
Code: Select all
#define CHAN_FLOOR 1 // Sound comes from the floor.
#define CHAN_CEILING 2 // Sound comes from the ceiling.
#define CHAN_FULLHEIGHT 3 // Sound comes entire height of the sector.
#define CHAN_INTERIOR 4 // Sound comes height between floor and ceiling.
[/spoiler]
And I'm guessing that some of them may have to be used elsewhere to fully copy across this fix. Bottom line, I'm confused.
Also, I also got this:
Code: Select all
.\src\p_mobj.cpp(3771) : error C2660: 'APlayerPawn::ResetAirSupply' : function does not take 1 arguments
Searching for ResetAirSupply gives me this:
[spoiler]
Code: Select all
Searching for: ResetAirSupply
src\d_player.h(129): bool ResetAirSupply (bool playgasp = true);
src\p_mobj.cpp(3614): p->mo->ResetAirSupply(false);
src\p_user.cpp(907): // If we were running out of air, then ResetAirSupply() will play *gasp.
src\p_user.cpp(915): // APlayerPawn :: ResetAirSupply
src\p_user.cpp(923): bool APlayerPawn::ResetAirSupply (bool playgasp)
src\p_user.cpp(2279): player->mo->ResetAirSupply ();
src\g_shared\a_artifacts.cpp(794): Owner->player->mo->ResetAirSupply ();
Found 7 occurrence(s) in 4 file(s)
[/spoiler]
That, however, looks a lot more straight forward and I think I will be able to change those entries to agree with the newer code where it is required.
So, I should be able to fix the gasp sound and may, or may not update to r120 (depending on whether I find any problems with r117 or, indeed r120) but it looks like the platform sound thing is beyond me ATM.
