OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved DObject and core parts of the VM to 'common'.

Browse source 
# Conflicts:
#	src/common/objects/dobject.h
This commit is contained in:
Christoph Oelckers 2020-04-11 19:21:41 +02:00
commit f8ac9a2662
48 changed files with 403 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/d_main.cpp
View file

@ -2743,6 +2743,10 @@ int PalCheck(int tex)
return tex;
}
static void Doom_CastSpriteIDToString(FString* a, unsigned int b)
{
*a = (b >= sprites.Size()) ? "TNT1" : sprites[b].name;
}
//==========================================================================
//
@ -2760,6 +2764,8 @@ static int D_DoomMain_Internal (void)
int argcount;
FIWadManager *iwad_man;
VM_CastSpriteIDToString = Doom_CastSpriteIDToString;
// Set up the button list. Mlook and Klook need a bit of extra treatment.
buttonMap.SetButtons(DoomButtons, countof(DoomButtons));
buttonMap.GetButton(Button_Mlook)->ReleaseHandler = Mlook_ReleaseHandler;