Merge branch 'accurate' into portable
This commit is contained in:
commit
7be98ac50f
2 changed files with 4 additions and 4 deletions
|
@ -198,15 +198,15 @@ BOOL LoadGenericData()
|
|||
else
|
||||
{
|
||||
MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_SCREEN_GRAB, TRUE);
|
||||
MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_LEVEL_BACKGROUND, FALSE);
|
||||
MakeSurface_Generic(320, 240, SURFACE_ID_LEVEL_BACKGROUND, FALSE);
|
||||
MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_MAP, TRUE);
|
||||
MakeSurface_Generic(WINDOW_WIDTH, WINDOW_HEIGHT, SURFACE_ID_CASTS, FALSE);
|
||||
MakeSurface_Generic(320, 240, SURFACE_ID_CASTS, FALSE);
|
||||
MakeSurface_Generic(256, 256, SURFACE_ID_LEVEL_TILESET, FALSE);
|
||||
MakeSurface_Generic(160, 16, SURFACE_ID_ROOM_NAME, FALSE);
|
||||
MakeSurface_Generic(40, 240, SURFACE_ID_VALUE_VIEW, FALSE);
|
||||
MakeSurface_Generic(320, 240, SURFACE_ID_LEVEL_SPRITESET_1, FALSE);
|
||||
MakeSurface_Generic(320, 240, SURFACE_ID_LEVEL_SPRITESET_2, FALSE);
|
||||
MakeSurface_Generic(WINDOW_WIDTH, 16 * MAX_STRIP, SURFACE_ID_CREDIT_CAST, FALSE);
|
||||
MakeSurface_Generic(320, 16 * MAX_STRIP, SURFACE_ID_CREDIT_CAST, FALSE);
|
||||
|
||||
pt_size = 0;
|
||||
pt_size += MakePixToneObject(&gPtpTable[0], 2, 32);
|
||||
|
|
|
@ -216,7 +216,7 @@ BOOL IsMapping()
|
|||
|
||||
void StartMapping()
|
||||
{
|
||||
memset(gMapping, FALSE, 0x80);
|
||||
memset(gMapping, FALSE, sizeof(gMapping));
|
||||
}
|
||||
|
||||
void SetMapping(int a)
|
||||
|
|
Loading…
Add table
Reference in a new issue