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

- Removed the ADVEN macro in favour of using the overloaded operatr[] on univ.party

Browse Source 
- Removed all referenes to cPopulation::dudes in favour of the overloaded operator[]

git-svn-id: http://openexile.googlecode.com/svn/trunk@84 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-05-30 23:11:47 +00:00
parent aa2f13c679
commit c55948c03f
46 changed files with 1881 additions and 1926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osx/classes/creatlist.cpp
View File

@@ -15,7 +15,6 @@
#include "classes.h"
#include "oldstructs.h"
__attribute__((deprecated))
cPopulation& cPopulation::operator = (legacy::creature_list_type old){
for(int i = 0; i < 60; i++)
dudes[i] = old.dudes[i];

2
osx/classes/creatlist.h
View File

@@ -15,7 +15,6 @@ namespace legacy {
};
class cPopulation { // formerly creature_list_type
public:
// class cCreature { // formerly creature_data_type
// public:
// short active, attitude;
@@ -29,6 +28,7 @@ public:
// cCreature& operator = (legacy::creature_data_type old);
// };
cCreature dudes[60];
public:
short which_town;
short friendly;

1
osx/classes/item.cpp
View File

@@ -292,7 +292,6 @@ cItemRec::cItemRec(long preset){
}
}
__attribute__((deprecated))
cItemRec& cItemRec::operator = (legacy::item_record_type& old){
variety = (eItemType) old.variety;
item_level = old.item_level;

2
osx/classes/monster.cpp
View File

@@ -15,7 +15,6 @@
#include "classes.h"
#include "oldstructs.h"
__attribute__((deprecated))
cMonster& cMonster::operator = (legacy::monster_record_type& old){
int i;
m_num = old.m_num;
@@ -95,7 +94,6 @@ cCreature& cCreature::operator = (legacy::creature_start_type old){
return *this;
}
__attribute__((deprecated))
cCreature& cCreature::operator = (legacy::creature_data_type old){
active = old.active;
attitude = old.attitude;

1
osx/classes/outdoors.cpp
View File

@@ -17,7 +17,6 @@
extern cScenario scenario;
__attribute__((deprecated))
cOutdoors& cOutdoors::operator = (legacy::outdoor_record_type& old){
int i,j;
for(i = 0; i < 48; i++)

5
osx/classes/party.cpp
View File

@@ -15,7 +15,6 @@
#include "classes.h"
#include "oldstructs.h"
__attribute__((deprecated))
cParty& cParty::operator = (legacy::party_record_type& old){
int i,j;
age = old.age;
@@ -107,13 +106,11 @@ cParty& cParty::operator = (legacy::party_record_type& old){
return *this;
}
__attribute__((deprecated))
void cParty::append(legacy::stored_items_list_type& old,short which_list){
for(int i = 0; i < 115; i++)
stored_items[which_list][i] = old.items[i];
}
__attribute__((deprecated))
void cParty::append(legacy::setup_save_type& old){
for(int n = 0; n < 4; n++)
for(int i = 0; i < 64; i++)
@@ -121,7 +118,6 @@ void cParty::append(legacy::setup_save_type& old){
setup[n][i][j] = old.setup[n][i][j];
}
__attribute__((deprecated))
cParty::cConvers& cParty::cConvers::operator = (legacy::talk_save_type old){
personality = old.personality;
town_num = old.town_num;
@@ -130,7 +126,6 @@ cParty::cConvers& cParty::cConvers::operator = (legacy::talk_save_type old){
return *this;
}
__attribute__((deprecated))
void cParty::add_pc(legacy::pc_record_type old){
for(int i = 0; i < 6; i++)
if(adven[i].main_status == 0){

4
osx/classes/party.h
View File

@@ -87,9 +87,9 @@ public:
short m_killed[200]; // monsters killed per town, I think
long long total_m_killed, total_dam_done, total_xp_gained, total_dam_taken;
std::string scen_name;
private:
cPlayer adven[6];
public:
unsigned short setup[4][64][64]; // formerly setup_save_type
cItemRec stored_items[3][115]; // formerly stored_items_list_type

1
osx/classes/pc.cpp
View File

@@ -15,7 +15,6 @@
#include "classes.h"
#include "oldstructs.h"
__attribute__((deprecated))
cPlayer& cPlayer::operator = (legacy::pc_record_type old){
int i;
main_status = (eMainStatus) old.main_status;

3
osx/classes/regtown.cpp
View File

@@ -17,7 +17,6 @@
extern cScenario scenario;
__attribute__((deprecated))
void cTinyTown::append(legacy::tiny_tr_type& old){
int i,j;
cField the_field;
@@ -59,7 +58,6 @@ void cTinyTown::append(legacy::tiny_tr_type& old){
}
}
__attribute__((deprecated))
void cMedTown::append(legacy::ave_tr_type& old){
int i,j;
cField the_field;
@@ -101,7 +99,6 @@ void cMedTown::append(legacy::ave_tr_type& old){
}
}
__attribute__((deprecated))
void cBigTown::append(legacy::big_tr_type& old){
int i,j;
cField the_field;

3
osx/classes/scenario.cpp
View File

@@ -24,7 +24,6 @@ cScenario::cItemStorage::cItemStorage() : ter_type(-1), property(0) {
//{-1,{-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},{0,0,0,0,0,0,0,0,0,0},0}
__attribute__((deprecated))
cScenario& cScenario::operator = (legacy::scenario_data_type& old){
int i,j;
// for(i = 0; i < 3; i++) format.ver[i] = old.ver[i];
@@ -96,7 +95,6 @@ cScenario& cScenario::operator = (legacy::scenario_data_type& old){
return *this;
}
__attribute__((deprecated))
cScenario::cItemStorage& cScenario::cItemStorage::operator = (legacy::item_storage_shortcut_type& old){
ter_type = old.ter_type;
for(int i = 0; i < 10; i++) item_num[i] = old.item_num[i];
@@ -105,7 +103,6 @@ cScenario::cItemStorage& cScenario::cItemStorage::operator = (legacy::item_stora
return *this;
}
__attribute__((deprecated))
void cScenario::append(legacy::scen_item_data_type& old){
short i;
for(i = 0; i < 400; i++)

1
osx/classes/special.cpp
View File

@@ -29,7 +29,6 @@ cSpecial::cSpecial(){
jumpto = -1;
}
__attribute__((deprecated))
cSpecial& cSpecial::operator = (legacy::special_node_type& old){
type = old.type;
sd1 = old.sd1;

1
osx/classes/talking.cpp
View File

@@ -15,7 +15,6 @@
#include "classes.h"
#include "oldstructs.h"
__attribute__((deprecated))
cSpeech& cSpeech::operator = (legacy::talking_record_type& old){
int i,j;
for(i = 0; i < 200; i++)

1
osx/classes/terrain.cpp
View File

@@ -16,7 +16,6 @@
#include "oldstructs.h"
#include "boe.consts.h" // TODO: Put these constants in a global file
__attribute__((deprecated))
cTerrain& cTerrain::operator = (legacy::terrain_type_type& old){
static const short arenas[260] = {
1, 1, 0, 0, 0, 1, 1, 1, 1, 1, // 0 - grassy field

4
osx/classes/town.cpp
View File

@@ -15,14 +15,10 @@
#include "classes.h"
#include "oldstructs.h"
__attribute__((deprecated))
void cTown::append(legacy::big_tr_type& old){}
__attribute__((deprecated))
void cTown::append(legacy::ave_tr_type& old){}
__attribute__((deprecated))
void cTown::append(legacy::tiny_tr_type& old){}
__attribute__((deprecated))
cTown& cTown::operator = (legacy::town_record_type& old){
int i;
town_chop_time = old.town_chop_time;

7
osx/classes/universe.cpp
View File

@@ -16,14 +16,12 @@
#include "oldstructs.h"
#include "mathutil.h"
__attribute__((deprecated))
void cCurOut::append(legacy::out_info_type& old){
for(int i = 0; i < 96; i++)
for(int j = 0; j < 96; j++)
expl[i][j] = old.expl[i][j];
}
__attribute__((deprecated))
void cCurTown::append(legacy::current_town_type& old,short which_size){
num = old.town_num;
difficulty = old.difficulty;
@@ -52,7 +50,6 @@ void cCurTown::append(legacy::current_town_type& old,short which_size){
cur_talk_loaded = num;
}
__attribute__((deprecated))
void cCurTown::append(legacy::big_tr_type& old){
int i,j;
for(i = 0; i < record->max_dim(); i++)
@@ -71,13 +68,11 @@ void cCurTown::append(legacy::big_tr_type& old){
record->lighting(i,j) = old.lighting[i][j];
}
__attribute__((deprecated))
void cCurTown::append(legacy::town_item_list& old){
for(int i = 0; i < 115; i++)
items[i] = old.items[i];
}
__attribute__((deprecated))
void cUniverse::append(legacy::stored_town_maps_type& old){
for(int n = 0; n < 200; n++)
for(int i = 0; i < 8; i++)
@@ -85,7 +80,6 @@ void cUniverse::append(legacy::stored_town_maps_type& old){
town_maps[n][i][j] = old.town_maps[n][i][j];
}
__attribute__((deprecated))
void cUniverse::append(legacy::stored_outdoor_maps_type& old){
for(int n = 0; n < 100; n++)
for(int i = 0; i < 6; i++)
@@ -93,7 +87,6 @@ void cUniverse::append(legacy::stored_outdoor_maps_type& old){
out_maps[n][i][j] = old.outdoor_maps[n][i][j];
}
__attribute__((deprecated))
void cCurTown::append(unsigned char(& old_sfx)[64][64], unsigned char(& old_misc_i)[64][64]){
for(int i = 0; i < 64; i++)
for(int j = 0; j < 64; j++){

2
osx/classes/vehicle.cpp
View File

@@ -28,7 +28,6 @@ cVehicle::cVehicle() :
sector.x = 0; sector.y = 0;
}
__attribute__((deprecated))
cVehicle& cVehicle::operator = (legacy::horse_record_type& old){
which_town = old.which_town;
exists = old.exists;
@@ -42,7 +41,6 @@ cVehicle& cVehicle::operator = (legacy::horse_record_type& old){
return *this;
}
__attribute__((deprecated))
cVehicle& cVehicle::operator = (legacy::boat_record_type& old){
which_town = old.which_town;
exists = old.exists;