- Merged two classes (cPopulation::cCreature and cTown::cCreature)

- Changes some C-strings to STL-strings
- Fixed the problem where the spiderweb logo would not fully appear if ShowStartupSplash is disabled

git-svn-id: http://openexile.googlecode.com/svn/trunk@54 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
2009-05-07 02:50:16 +00:00
parent 68dcf3cdef
commit 4dc75d51c0
46 changed files with 932 additions and 831 deletions

View File

@@ -122,7 +122,7 @@ rectangle& cTinyTown::room_rect(size_t i){
return _room_rect[i];
}
cTown::cCreature& cTinyTown::creatures(size_t i){
cCreature& cTinyTown::creatures(size_t i){
return _creatures[i];
}
@@ -138,7 +138,7 @@ rectangle& cMedTown::room_rect(size_t i){
return _room_rect[i];
}
cTown::cCreature& cMedTown::creatures(size_t i){
cCreature& cMedTown::creatures(size_t i){
return _creatures[i];
}
@@ -154,7 +154,7 @@ rectangle& cBigTown::room_rect(size_t i){
return _room_rect[i];
}
cTown::cCreature& cBigTown::creatures(size_t i){
cCreature& cBigTown::creatures(size_t i){
return _creatures[i];
}
@@ -164,7 +164,7 @@ unsigned char& cBigTown::lighting(size_t i, size_t r){
cBigTown::cBigTown(){
int i;
cCreature dummy_creature = {0,0,loc(),0,0,0,0,0,0,0};
cCreature dummy_creature;// = {0,0,loc(),0,0,0,0,0,0,0};
Rect d_rect = {0,0,0,0};
for (i = 0; i < 16; i++) {
_room_rect[i].top = d_rect.top;
@@ -179,7 +179,7 @@ cBigTown::cBigTown(){
cMedTown::cMedTown(){
int i;
cCreature dummy_creature = {0,0,loc(),0,0,0,0,0,0,0};
cCreature dummy_creature;// = {0,0,loc(),0,0,0,0,0,0,0};
Rect d_rect = {0,0,0,0};
for (i = 0; i < 16; i++) {
_room_rect[i].top = d_rect.top;
@@ -194,7 +194,7 @@ cMedTown::cMedTown(){
cTinyTown::cTinyTown(){
int i;
cCreature dummy_creature = {0,0,loc(),0,0,0,0,0,0,0};
cCreature dummy_creature;// = {0,0,loc(),0,0,0,0,0,0,0};
Rect d_rect = {0,0,0,0};
for (i = 0; i < 16; i++) {
_room_rect[i].top = d_rect.top;