openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Some code cleanup, mainly constants

Browse Source 
- Strip out unused constants
- Use const instead of #define
- Remove some obsolete comments
This commit is contained in:
Celtic Minstrel
2017-02-12 00:04:53 -05:00
parent 2b8ff52992
commit 59f2a7b94e
18 changed files with 64 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pcedit/pc.action.cpp
View File

@@ -2,7 +2,6 @@
#include <cstdio>
#include "pc.graphics.hpp"
#include "pc.global.hpp"
#include "universe.hpp"
#include "pc.editors.hpp"
#include "pc.fileio.hpp"

1
src/pcedit/pc.editors.cpp
View File

@@ -1,6 +1,5 @@
#include "pc.graphics.hpp"
#include "pc.global.hpp"
#include "universe.hpp"
#include "pc.editors.hpp"
#include "graphtool.hpp"

1
src/pcedit/pc.fileio.cpp
View File

@@ -2,7 +2,6 @@
#include <cstring>
#include <cstdio>
#include "pc.global.hpp"
#include "universe.hpp"
#include "pc.fileio.hpp"
#include "pc.graphics.hpp"

34
src/pcedit/pc.global.hpp
View File

@@ -1,34 +0,0 @@
#define DRAG_EDGE 15
#define T_M 60
#define NUM_TOWN_ITEMS 115
#define DRAG_EDGE 15
#define DISPLAY_LEFT 23
#define DISPLAY_TOP 23
#define BITMAP_WIDTH 28
#define BITMAP_HEIGHT 36
#define PC_WIN_UL_X 291
#define PC_WIN_UL_Y 5
#define ITEM_WIN_UL_X 291
#define ITEM_WIN_UL_Y 130
#define TEXT_WIN_UL_X 291
#define TEXT_WIN_UL_Y 283
#define NUM_BUTTONS 15
#define DOOR_LIGHT can_enter = run_trap(7,&PSD[c_town.town_num][which],4220,0); break;
#define DOOR_HEAVY can_enter = run_trap(7,&PSD[c_town.town_num][which],4220,20); break;
#define DOOR_ALARM can_enter = run_trap(7,&PSD[c_town.town_num][which],4220,11); break;
#define DRESSER_LIGHT can_enter = run_trap(7,&PSD[c_town.town_num][which],4221,0); break;
#define DRESSER_HEAVY can_enter = run_trap(7,&PSD[c_town.town_num][which],4221,20); break;
#define DRESSER_ALARM can_enter = run_trap(7,&PSD[c_town.town_num][which],4221,11); break;
#define FLOOR_LIGHT can_enter = run_trap(7,&PSD[c_town.town_num][which],4222,0); break;
#define FLOOR_HEAVY can_enter = run_trap(7,&PSD[c_town.town_num][which],4222,20); break;
#define FLOOR_ALARM can_enter = run_trap(7,&PSD[c_town.town_num][which],4222,11); break;
#define CHEST_LIGHT can_enter = run_trap(7,&PSD[c_town.town_num][which],3450,0); break;
#define CHEST_HEAVY can_enter = run_trap(7,&PSD[c_town.town_num][which],3450,20); break;
#define CHEST_ALARM can_enter = run_trap(7,&PSD[c_town.town_num][which],3450,11); break;

1
src/pcedit/pc.graphics.cpp
View File

@@ -1,6 +1,5 @@
#include <iomanip>
#include "pc.global.hpp"
#include "universe.hpp"
#include "pc.graphics.hpp"
#include "pc.editors.hpp"

1
src/pcedit/pc.main.cpp
View File

@@ -2,7 +2,6 @@
#include <iostream>
#include <cstring>
#include <boost/filesystem/operations.hpp>
#include "pc.global.hpp"
#include "universe.hpp"
#include "pc.graphics.hpp"
#include "pc.editors.hpp"