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

Rename underscore-initial names in cTown subclasses

Browse Source
This commit is contained in:
Celtic Minstrel
2015-01-23 16:14:57 -05:00
parent 869c629b8b
commit 8d352423b3
4 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/classes/regtown.cpp
View File

@@ -34,14 +34,14 @@ void cTinyTown::append(legacy::tiny_tr_type& old, int town_num){
} }
for(i = 0; i < 32; i++) for(i = 0; i < 32; i++)
for(j = 0; j < 32; j++) { for(j = 0; j < 32; j++) {
_terrain[i][j] = old.terrain[i][j]; ter[i][j] = old.terrain[i][j];
_lighting[i / 8][j] = old.lighting[i / 8][j]; light[i / 8][j] = old.lighting[i / 8][j];
if(scenario.ter_types[_terrain[i][j]].i == 3000) { // marker to indicate it used to be a special spot if(scenario.ter_types[ter[i][j]].i == 3000) { // marker to indicate it used to be a special spot
the_field.loc.x = i; the_field.loc.x = i;
the_field.loc.y = j; the_field.loc.y = j;
preset_fields.push_back(the_field); preset_fields.push_back(the_field);
} }
if(scenario.ter_types[_terrain[i][j]].boat_over) { if(scenario.ter_types[ter[i][j]].boat_over) {
// Try to fix specials that could be triggered while in a boat // Try to fix specials that could be triggered while in a boat
// (Boats never triggered specials in the old BoE, so we probably don't want them to trigger.) // (Boats never triggered specials in the old BoE, so we probably don't want them to trigger.)
int found_spec = -1; int found_spec = -1;
@@ -99,14 +99,14 @@ void cMedTown::append(legacy::ave_tr_type& old, int town_num){
} }
for(i = 0; i < 48; i++) for(i = 0; i < 48; i++)
for(j = 0; j < 48; j++) { for(j = 0; j < 48; j++) {
_terrain[i][j] = old.terrain[i][j]; ter[i][j] = old.terrain[i][j];
_lighting[i / 8][j] = old.lighting[i / 8][j]; light[i / 8][j] = old.lighting[i / 8][j];
if(scenario.ter_types[_terrain[i][j]].i == 3000) { // marker to indicate it used to be a special spot if(scenario.ter_types[ter[i][j]].i == 3000) { // marker to indicate it used to be a special spot
the_field.loc.x = i; the_field.loc.x = i;
the_field.loc.y = j; the_field.loc.y = j;
preset_fields.push_back(the_field); preset_fields.push_back(the_field);
} }
if(scenario.ter_types[_terrain[i][j]].boat_over) { if(scenario.ter_types[ter[i][j]].boat_over) {
// Try to fix specials that could be triggered while in a boat // Try to fix specials that could be triggered while in a boat
// (Boats never triggered specials in the old BoE, so we probably don't want them to trigger.) // (Boats never triggered specials in the old BoE, so we probably don't want them to trigger.)
int found_spec = -1; int found_spec = -1;
@@ -164,14 +164,14 @@ void cBigTown::append(legacy::big_tr_type& old, int town_numo){
} }
for(i = 0; i < 64; i++) for(i = 0; i < 64; i++)
for(j = 0; j < 64; j++) { for(j = 0; j < 64; j++) {
_terrain[i][j] = old.terrain[i][j]; ter[i][j] = old.terrain[i][j];
_lighting[i / 8][j] = old.lighting[i / 8][j]; light[i / 8][j] = old.lighting[i / 8][j];
if(scenario.ter_types[_terrain[i][j]].i == 3000) { // marker to indicate it used to be a special spot if(scenario.ter_types[ter[i][j]].i == 3000) { // marker to indicate it used to be a special spot
the_field.loc.x = i; the_field.loc.x = i;
the_field.loc.y = j; the_field.loc.y = j;
preset_fields.push_back(the_field); preset_fields.push_back(the_field);
} }
if(scenario.ter_types[_terrain[i][j]].boat_over) { if(scenario.ter_types[ter[i][j]].boat_over) {
// Try to fix specials that could be triggered while in a boat // Try to fix specials that could be triggered while in a boat
// (Boats never triggered specials in the old BoE, so we probably don't want them to trigger.) // (Boats never triggered specials in the old BoE, so we probably don't want them to trigger.)
int found_spec = -1; int found_spec = -1;
@@ -212,57 +212,56 @@ void cBigTown::append(legacy::big_tr_type& old, int town_numo){
} }
ter_num_t& cTinyTown::terrain(size_t x, size_t y){ ter_num_t& cTinyTown::terrain(size_t x, size_t y){
return _terrain[x][y]; return ter[x][y];
} }
void cTinyTown::writeTerrainTo(std::ostream& file) { void cTinyTown::writeTerrainTo(std::ostream& file) {
writeArray(file, _terrain, 32, 32); writeArray(file, ter, 32, 32);
} }
void cTinyTown::readTerrainFrom(std::istream& file) { void cTinyTown::readTerrainFrom(std::istream& file) {
readArray(file, _terrain, 32, 32); readArray(file, ter, 32, 32);
} }
unsigned char& cTinyTown::lighting(size_t i, size_t r){ unsigned char& cTinyTown::lighting(size_t i, size_t r){
return _lighting[i][r]; return light[i][r];
} }
ter_num_t& cMedTown::terrain(size_t x, size_t y){ ter_num_t& cMedTown::terrain(size_t x, size_t y){
return _terrain[x][y]; return ter[x][y];
} }
void cMedTown::writeTerrainTo(std::ostream& file) { void cMedTown::writeTerrainTo(std::ostream& file) {
writeArray(file, _terrain, 48, 48); writeArray(file, ter, 48, 48);
} }
void cMedTown::readTerrainFrom(std::istream& file) { void cMedTown::readTerrainFrom(std::istream& file) {
readArray(file, _terrain, 48, 48); readArray(file, ter, 48, 48);
} }
unsigned char& cMedTown::lighting(size_t i, size_t r){ unsigned char& cMedTown::lighting(size_t i, size_t r){
return _lighting[i][r]; return light[i][r];
} }
ter_num_t& cBigTown::terrain(size_t x, size_t y){ ter_num_t& cBigTown::terrain(size_t x, size_t y){
return _terrain[x][y]; return ter[x][y];
} }
void cBigTown::writeTerrainTo(std::ostream& file) { void cBigTown::writeTerrainTo(std::ostream& file) {
writeArray(file, _terrain, 64, 64); writeArray(file, ter, 64, 64);
} }
void cBigTown::readTerrainFrom(std::istream& file) { void cBigTown::readTerrainFrom(std::istream& file) {
readArray(file, _terrain, 64, 64); readArray(file, ter, 64, 64);
} }
unsigned char& cBigTown::lighting(size_t i, size_t r){ unsigned char& cBigTown::lighting(size_t i, size_t r){
return _lighting[i][r]; return light[i][r];
} }
cBigTown::cBigTown(cScenario& scenario, bool init_strings) : cTown(scenario, init_strings) { cBigTown::cBigTown(cScenario& scenario, bool init_strings) : cTown(scenario, init_strings) {
int i; for(size_t i = 0; i < max_dim(); i++)
for(i = 0; i < max_dim(); i++) for(size_t j = 0; j < max_dim(); j++) {
for(int j = 0; j < max_dim(); j++) {
terrain(i,j) = scenario.default_ground * 2; terrain(i,j) = scenario.default_ground * 2;
lighting(i / 8,j) = 0; lighting(i / 8,j) = 0;
} }
@@ -270,9 +269,8 @@ cBigTown::cBigTown(cScenario& scenario, bool init_strings) : cTown(scenario, ini
} }
cMedTown::cMedTown(cScenario& scenario, bool init_strings) : cTown(scenario, init_strings) { cMedTown::cMedTown(cScenario& scenario, bool init_strings) : cTown(scenario, init_strings) {
int i; for(size_t i = 0; i < max_dim(); i++)
for(i = 0; i < max_dim(); i++) for(size_t j = 0; j < max_dim(); j++) {
for(int j = 0; j < max_dim(); j++) {
terrain(i,j) = scenario.default_ground * 2; terrain(i,j) = scenario.default_ground * 2;
lighting(i / 8,j) = 0; lighting(i / 8,j) = 0;
} }
@@ -280,9 +278,8 @@ cMedTown::cMedTown(cScenario& scenario, bool init_strings) : cTown(scenario, ini
} }
cTinyTown::cTinyTown(cScenario& scenario, bool init_strings) : cTown(scenario, init_strings) { cTinyTown::cTinyTown(cScenario& scenario, bool init_strings) : cTown(scenario, init_strings) {
int i; for(size_t i = 0; i < max_dim(); i++)
for(i = 0; i < max_dim(); i++) for(size_t j = 0; j < max_dim(); j++) {
for(int j = 0; j < max_dim(); j++) {
terrain(i,j) = scenario.default_ground * 2; terrain(i,j) = scenario.default_ground * 2;
lighting(i / 8,j) = 0; lighting(i / 8,j) = 0;
} }

12
src/classes/regtown.h
View File

@@ -23,8 +23,8 @@ namespace legacy {
}; };
class cBigTown : public cTown { // formerly big_tr_type class cBigTown : public cTown { // formerly big_tr_type
ter_num_t _terrain[64][64]; ter_num_t ter[64][64];
unsigned char _lighting[8][64]; unsigned char light[8][64];
public: public:
void append(legacy::big_tr_type& old, int town_num); void append(legacy::big_tr_type& old, int town_num);
ter_num_t& terrain(size_t x, size_t y); ter_num_t& terrain(size_t x, size_t y);
@@ -37,8 +37,8 @@ public:
}; };
class cMedTown : public cTown { // formerly ave_tr_type class cMedTown : public cTown { // formerly ave_tr_type
ter_num_t _terrain[48][48]; ter_num_t ter[48][48];
unsigned char _lighting[6][48]; unsigned char light[6][48];
public: public:
void append(legacy::ave_tr_type& old, int town_num); void append(legacy::ave_tr_type& old, int town_num);
ter_num_t& terrain(size_t x, size_t y); ter_num_t& terrain(size_t x, size_t y);
@@ -51,8 +51,8 @@ public:
}; };
class cTinyTown : public cTown { // formerly tiny_tr_type class cTinyTown : public cTown { // formerly tiny_tr_type
ter_num_t _terrain[32][32]; ter_num_t ter[32][32];
unsigned char _lighting[4][32]; unsigned char light[4][32];
public: public:
void append(legacy::tiny_tr_type& old, int town_num); void append(legacy::tiny_tr_type& old, int town_num);
ter_num_t& terrain(size_t x, size_t y); ter_num_t& terrain(size_t x, size_t y);

4
src/classes/tmpltown.cpp
View File

@@ -26,10 +26,6 @@ void cBigTemplTown::readTerrainFrom(std::istream& /*file*/) {
// TODO: Read in the terrain somehow // TODO: Read in the terrain somehow
} }
unsigned char& cBigTemplTown::lighting(size_t i, size_t r){
return _lighting[i][r];
}
size_t cBigTemplTown::max_dim() const { size_t cBigTemplTown::max_dim() const {
return 0; // not sure what they are yet. return 0; // not sure what they are yet.
} }

12
src/classes/tmpltown.h
View File

@@ -36,33 +36,27 @@ public:
cTerRect ter_rects[10]; cTerRect ter_rects[10];
}; };
class cBigTemplTown : public cBigTown, cTemplTown { class cBigTemplTown : public cBigTown, public cTemplTown {
unsigned char _lighting[8][64];
public: public:
ter_num_t& terrain(size_t x, size_t y); ter_num_t& terrain(size_t x, size_t y);
unsigned char& lighting(size_t i, size_t r);
size_t max_dim() const; size_t max_dim() const;
void writeTerrainTo(std::ostream& file); void writeTerrainTo(std::ostream& file);
void readTerrainFrom(std::istream& file); void readTerrainFrom(std::istream& file);
explicit cBigTemplTown(cScenario& scenario, bool init_strings = false); explicit cBigTemplTown(cScenario& scenario, bool init_strings = false);
}; };
class cMedTemplTown : public cMedTown, cTemplTown { class cMedTemplTown : public cMedTown, public cTemplTown {
unsigned char _lighting[6][48];
public: public:
ter_num_t& terrain(size_t x, size_t y); ter_num_t& terrain(size_t x, size_t y);
unsigned char& lighting(size_t i, size_t r);
size_t max_dim() const; size_t max_dim() const;
void writeTerrainTo(std::ostream& file); void writeTerrainTo(std::ostream& file);
void readTerrainFrom(std::istream& file); void readTerrainFrom(std::istream& file);
explicit cMedTemplTown(cScenario& scenario, bool init_strings = false); explicit cMedTemplTown(cScenario& scenario, bool init_strings = false);
}; };
class cTinyTemplTown : public cTinyTown, cTemplTown { class cTinyTemplTown : public cTinyTown, public cTemplTown {
unsigned char _lighting[4][32];
public: public:
ter_num_t& terrain(size_t x, size_t y); ter_num_t& terrain(size_t x, size_t y);
unsigned char& lighting(size_t i, size_t r);
size_t max_dim() const; size_t max_dim() const;
void writeTerrainTo(std::ostream& file); void writeTerrainTo(std::ostream& file);
void readTerrainFrom(std::istream& file); void readTerrainFrom(std::istream& file);