Skip to content

Commit

Permalink
Support DeHackEd patches with BOOM extensions (BEX)
Browse files Browse the repository at this point in the history 
Completely removed first attempt at supporting DeHackEd patches in
commit 0354dc3, and instead of using
code from Chocolate DOOM, I've taken code from WinMBF, allowing support
for BEX as well. A lot of work is still to be done, but as an initial
"test", map names in BTSX_E1.WAD now appear in the automap.
  • Loading branch information
@bradharding
bradharding committed Aug 22, 2014
1 parent 76e18ec commit f1ee4cc
Show file tree
Hide file tree
Showing 49 changed files with 3,526 additions and 3,365 deletions.
22 changes: 2 additions & 20 deletions msvc/doomretro.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,18 +370,13 @@
<CustomBuildStep Include="..\src\z_zone.h" />
<ClInclude Include="..\src\am_map.h" />
<ClInclude Include="..\src\config.h" />
<ClInclude Include="..\src\deh_defs.h" />
<ClInclude Include="..\src\deh_io.h" />
<ClInclude Include="..\src\deh_main.h" />
<ClInclude Include="..\src\deh_mapping.h" />
<ClInclude Include="..\src\deh_misc.h" />
<ClInclude Include="..\src\deh_str.h" />
<ClInclude Include="..\src\doomdata.h" />
<ClInclude Include="..\src\doomdef.h" />
<ClInclude Include="..\src\doomkeys.h" />
<ClInclude Include="..\src\doomstat.h" />
<ClInclude Include="..\src\doomtype.h" />
<ClInclude Include="..\src\dstrings.h" />
<ClInclude Include="..\src\d_deh.h" />
<ClInclude Include="..\src\d_englsh.h" />
<ClInclude Include="..\src\d_event.h" />
<ClInclude Include="..\src\d_items.h" />
Expand Down Expand Up @@ -451,22 +446,9 @@
<ClInclude Include="..\src\z_zone.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\deh_ammo.c" />
<ClCompile Include="..\src\deh_cheat.c" />
<ClCompile Include="..\src\deh_doom.c" />
<ClCompile Include="..\src\deh_frame.c" />
<ClCompile Include="..\src\deh_io.c" />
<ClCompile Include="..\src\deh_main.c" />
<ClCompile Include="..\src\deh_mapping.c" />
<ClCompile Include="..\src\deh_misc.c" />
<ClCompile Include="..\src\deh_ptr.c" />
<ClCompile Include="..\src\deh_sound.c" />
<ClCompile Include="..\src\deh_str.c" />
<ClCompile Include="..\src\deh_text.c" />
<ClCompile Include="..\src\deh_thing.c" />
<ClCompile Include="..\src\deh_weapon.c" />
<ClCompile Include="..\src\doomstat.c" />
<ClCompile Include="..\src\dstrings.c" />
<ClCompile Include="..\src\d_deh.c" />
<ClCompile Include="..\src\info.c" />
<ClCompile Include="..\src\i_sdlmusic.c" />
<ClCompile Include="..\src\i_sdlsound.c" />
Expand Down
12 changes: 6 additions & 6 deletions src/am_map.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#endif

#include "am_map.h"
#include "deh_main.h"
#include "d_deh.h"
#include "doomstat.h"
#include "dstrings.h"
#include "hu_stuff.h"
Expand Down Expand Up @@ -789,7 +789,7 @@ boolean AM_Responder(event_t *ev)
if (followplayer)
m_paninc.x = m_paninc.y = 0;
f_oldloc.x = INT_MAX;
plr->message = DEH_String(followplayer ? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF);
plr->message = (followplayer ? s_AMSTR_FOLLOWON : s_AMSTR_FOLLOWOFF);
message_dontfuckwithme = true;
}
}
Expand All @@ -801,7 +801,7 @@ boolean AM_Responder(event_t *ev)
{
keydown = key;
grid = !grid;
plr->message = DEH_String(grid ? AMSTR_GRIDON : AMSTR_GRIDOFF);
plr->message = (grid ? s_AMSTR_GRIDON : s_AMSTR_GRIDOFF);
message_dontfuckwithme = true;
}
}
Expand All @@ -825,14 +825,14 @@ boolean AM_Responder(event_t *ev)
if (++markpress == 5)
{
// clear all marks
plr->message = DEH_String(markpointnum == 1 ? AMSTR_MARKCLEARED : AMSTR_MARKSCLEARED);
plr->message = (markpointnum == 1 ? s_AMSTR_MARKCLEARED : s_AMSTR_MARKSCLEARED);
message_dontfuckwithme = true;
markpointnum = 0;
}
else if (markpress == 1)
{
// clear one mark
plr->message = DEH_String(AMSTR_MARKCLEARED);
plr->message = s_AMSTR_MARKCLEARED;
message_dontfuckwithme = true;
markpointnum--;
}
Expand All @@ -846,7 +846,7 @@ boolean AM_Responder(event_t *ev)
{
keydown = key;
rotate = !rotate;
plr->message = DEH_String(rotate ? AMSTR_ROTATEON : AMSTR_ROTATEOFF);
plr->message = (rotate ? s_AMSTR_ROTATEON : s_AMSTR_ROTATEOFF);
message_dontfuckwithme = true;
}
}
Expand Down
28 changes: 14 additions & 14 deletions src/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/*
========================================================================
DOOM RETRO
The classic, refined DOOM source port. For Windows PC.
Copyright (C) 2013-2014 Brad Harding.
DOOM RETRO
The classic, refined DOOM source port. For Windows PC.
Copyright (C) 2013-2014 Brad Harding.
This file is part of DOOM RETRO.
This file is part of DOOM RETRO.
DOOM RETRO is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
DOOM RETRO is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
DOOM RETRO is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
DOOM RETRO is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with DOOM RETRO. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License
along with DOOM RETRO. If not, see <http://www.gnu.org/licenses/>.
========================================================================
*/
Expand Down

0 comments on commit f1ee4cc

Please sign in to comment.