libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CHEWY: Merge roomdefs into room

Browse Source
This commit is contained in:
Paul Gilbert 2022-01-06 22:41:21 -08:00
parent f3797cb558
commit 2bba407db0
11 changed files with 19 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/chewy/module.mk
View File

@ -45,7 +45,6 @@ MODULE_OBJS = \
timer.o \
types.o \
video/cfo_decoder.o \
rooms/roomdefs.o \
rooms/room0.o \
rooms/room1.o \
rooms/room2.o \

7
engines/chewy/room.cpp
View File

@ -26,6 +26,13 @@
namespace Chewy {
const int16 SURIMY_TAF19_PHASEN[4][2] = {
{ 0, 0 },
{ 39, 46 },
{ 0, 0 },
{ 0, 0 }
};
Room::Room() {
int16 i;
room_timer.TimerAnz = 0;

6
engines/chewy/room.h
View File

@ -26,6 +26,12 @@
namespace Chewy {
#define ANI_HIDE 0
#define ANI_SHOW 1
#define SURIMY_OBJ 0
extern const int16 SURIMY_TAF19_PHASEN[4][2];
#define MAX_ABLAGE 4
#define ABLAGE_BLOCK_SIZE 64000l

2
engines/chewy/rooms/room0.cpp
View File

@ -23,7 +23,7 @@
#include "chewy/events.h"
#include "chewy/global.h"
#include "chewy/ani_dat.h"
#include "chewy/rooms/roomdefs.h"
#include "chewy/room.h"
#include "chewy/rooms/room0.h"
namespace Chewy {

2
engines/chewy/rooms/room14.cpp
View File

@ -23,7 +23,7 @@
#include "chewy/events.h"
#include "chewy/global.h"
#include "chewy/ani_dat.h"
#include "chewy/rooms/roomdefs.h"
#include "chewy/room.h"
#include "chewy/rooms/room14.h"
#include "chewy/rooms/room23.h"

2
engines/chewy/rooms/room18.cpp
View File

@ -23,7 +23,7 @@
#include "chewy/events.h"
#include "chewy/global.h"
#include "chewy/ani_dat.h"
#include "chewy/rooms/roomdefs.h"
#include "chewy/room.h"
#include "chewy/rooms/room18.h"
namespace Chewy {

2
engines/chewy/rooms/room3.cpp
View File

@ -23,7 +23,7 @@
#include "chewy/events.h"
#include "chewy/global.h"
#include "chewy/ani_dat.h"
#include "chewy/rooms/roomdefs.h"
#include "chewy/room.h"
#include "chewy/rooms/room2.h"
#include "chewy/rooms/room3.h"
#include "chewy/rooms/room4.h"

2
engines/chewy/rooms/room31.cpp
View File

@ -23,7 +23,7 @@
#include "chewy/events.h"
#include "chewy/global.h"
#include "chewy/ani_dat.h"
#include "chewy/rooms/roomdefs.h"
#include "chewy/room.h"
#include "chewy/rooms/room31.h"
namespace Chewy {

2
engines/chewy/rooms/room33.cpp
View File

@ -24,7 +24,7 @@
#include "chewy/global.h"
#include "chewy/ani_dat.h"
#include "chewy/room.h"
#include "chewy/rooms/roomdefs.h"
#include "chewy/room.h"
#include "chewy/rooms/room33.h"
namespace Chewy {

37
engines/chewy/rooms/roomdefs.cpp
View File

@ -1,37 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program 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.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "chewy/rooms/roomdefs.h"
#include "chewy/defines.h"
#include "chewy/events.h"
#include "chewy/global.h"
#include "chewy/ani_dat.h"
namespace Chewy {
const int16 SURIMY_TAF19_PHASEN[4][2] = {
{ 0, 0 },
{ 39, 46 },
{ 0, 0 },
{ 0, 0 }
};
} // namespace Chewy

38
engines/chewy/rooms/roomdefs.h
View File

@ -1,38 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program 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.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef CHEWY_ROOMS_ROOMDEFS_H
#define CHEWY_ROOMS_ROOMDEFS_H
#include "common/scummsys.h"
namespace Chewy {
#define ANI_HIDE 0
#define ANI_SHOW 1
#define SURIMY_OBJ 0
extern const int16 SURIMY_TAF19_PHASEN[4][2];
} // namespace Chewy
#endif