[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/map map_wall.c map_wood.c tileset.c
|
From: |
Jimmy Salmon |
|
Subject: |
[Stratagus-CVS] stratagus/src/map map_wall.c map_wood.c tileset.c |
|
Date: |
Sat, 27 Sep 2003 16:04:24 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/09/27 16:04:24
Modified files:
src/map : map_wall.c map_wood.c tileset.c
Log message:
Cleanup
Patches:
Index: stratagus/src/map/map_wall.c
diff -u stratagus/src/map/map_wall.c:1.25 stratagus/src/map/map_wall.c:1.26
--- stratagus/src/map/map_wall.c:1.25 Fri Jul 11 10:35:32 2003
+++ stratagus/src/map/map_wall.c Sat Sep 27 16:04:24 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map_wall.c,v 1.25 2003/07/11 14:35:32 n0body Exp $
+// $Id: map_wall.c,v 1.26 2003/09/27 20:04:24 jsalmon3 Exp $
//@{
@@ -81,8 +81,8 @@
{
int t;
- t = TheMap.Tileset->TileTypeTable
- [TheMap.Fields[(x) + (y) * TheMap.Width]. SeenTile];
+ t = TheMap.Tileset->TileTypeTable[
+ TheMap.Fields[x + y * TheMap.Width].SeenTile];
if (walltype == -1) {
return t == TileTypeHumanWall || t == TileTypeOrcWall;
}
@@ -99,7 +99,7 @@
{
int t;
int tile;
- MapField *mf;
+ MapField* mf;
// Outside of map or no wall.
if (x < 0 || y < 0 || x >= TheMap.Width || y >= TheMap.Height) {
@@ -194,7 +194,7 @@
global void MapFixWallTile(int x, int y)
{
int tile;
- MapField *mf;
+ MapField* mf;
int t;
// Outside of map or no wall.
Index: stratagus/src/map/map_wood.c
diff -u stratagus/src/map/map_wood.c:1.27 stratagus/src/map/map_wood.c:1.28
--- stratagus/src/map/map_wood.c:1.27 Sun Aug 10 22:14:46 2003
+++ stratagus/src/map/map_wood.c Sat Sep 27 16:04:24 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: map_wood.c,v 1.27 2003/08/11 02:14:46 n0body Exp $
+// $Id: map_wood.c,v 1.28 2003/09/27 20:04:24 jsalmon3 Exp $
//@{
@@ -70,8 +70,7 @@
global int MapIsSeenTileWood(int x, int y)
{
return TheMap.Tileset->TileTypeTable[
- TheMap.Fields[(x)+(y)*TheMap.Width].SeenTile
- ] == TileTypeWood;
+ TheMap.Fields[x + y * TheMap.Width].SeenTile] == TileTypeWood;
}
/**
@@ -87,7 +86,7 @@
int ttdown;
int ttleft;
int ttright;
- MapField *mf;
+ MapField* mf;
// Outside of map or no wood.
@@ -167,15 +166,15 @@
if (tile == -1) { // No valid wood remove it.
mf->SeenTile = TheMap.Tileset->RemovedTree;
MapFixSeenWoodNeighbors(x, y);
- } else if( TheMap.Tileset->MixedLookupTable[mf->SeenTile]==
- TheMap.Tileset->MixedLookupTable[tile] ) { //Same Type
+ } else if (TheMap.Tileset->MixedLookupTable[mf->SeenTile] ==
+ TheMap.Tileset->MixedLookupTable[tile]) { //Same Type
return;
} else {
mf->SeenTile = tile;
}
// FIXME: can this only happen if seen?
- if ( IsMapFieldVisible(ThisPlayer,x,y) ) {
+ if (IsMapFieldVisible(ThisPlayer, x, y)) {
UpdateMinimapSeenXY(x, y);
MarkDrawPosMap(x, y);
MustRedraw |= RedrawMinimap;
@@ -231,7 +230,7 @@
int ttdown;
int ttleft;
int ttright;
- MapField *mf;
+ MapField* mf;
// Outside of map or no wood.
@@ -285,7 +284,7 @@
tile += ((ttleft & 0x02) && (ttdown & 0x08)) * 1;
if ((ttdown & 0x10) && 1) {
- tile |= ((ttleft & 0x06) && 1)* 1;
+ tile |= ((ttleft & 0x06) && 1) * 1;
tile |= ((ttright & 0x09) && 1) * 2;
}
@@ -307,12 +306,12 @@
if (tile == -1) { // No valid wood remove it.
MapRemoveWood(x, y);
} else if (TheMap.Tileset->MixedLookupTable[mf->Tile] !=
- TheMap.Tileset->MixedLookupTable[tile]) {
+ TheMap.Tileset->MixedLookupTable[tile]) {
mf->Tile = tile;
UpdateMinimapXY(x, y);
//MapFixWoodNeighbors(x, y);
- if ( IsMapFieldVisible(ThisPlayer,x,y) ) {
+ if (IsMapFieldVisible(ThisPlayer, x, y)) {
UpdateMinimapSeenXY(x, y);
MapMarkSeenTile(x, y);
MarkDrawPosMap(x, y);
@@ -329,8 +328,8 @@
*/
global void MapRemoveWood(unsigned x, unsigned y)
{
- //EditTile(x,y,TheMap.Tileset->RemovedTree);
- MapField *mf;
+ //EditTile(x, y, TheMap.Tileset->RemovedTree);
+ MapField* mf;
mf = TheMap.Fields + x + y * TheMap.Width;
@@ -341,7 +340,7 @@
UpdateMinimapXY(x, y);
MapFixWoodNeighbors(x, y);
- if ( IsMapFieldVisible(ThisPlayer,x,y) ) {
+ if (IsMapFieldVisible(ThisPlayer, x, y)) {
UpdateMinimapSeenXY(x, y);
MapMarkSeenTile(x, y);
MarkDrawPosMap(x, y);
@@ -357,8 +356,8 @@
*/
global void RegenerateForest(void)
{
- MapField *mf;
- MapField *tmp;
+ MapField* mf;
+ MapField* tmp;
int x;
int y;
@@ -374,20 +373,15 @@
for (y = 0; y < TheMap.Height; ++y) {
mf = TheMap.Fields + x + y * TheMap.Width;
if (mf->Tile == TheMap.Tileset->RemovedTree) {
- if (mf->Value >= ForestRegeneration
- || ++mf->Value == ForestRegeneration) {
- if (x
- && !(mf->
- Flags & (MapFieldWall | MapFieldUnpassable |
- MapFieldLandUnit | MapFieldBuilding))) {
+ if (mf->Value >= ForestRegeneration ||
+ ++mf->Value == ForestRegeneration) {
+ if (x && !(mf->Flags & (MapFieldWall | MapFieldUnpassable |
+ MapFieldLandUnit | MapFieldBuilding))) {
tmp = mf - TheMap.Width;
- if (tmp->Tile == TheMap.Tileset->RemovedTree
- && tmp->Value >= ForestRegeneration
- && !(tmp->
- Flags & (MapFieldWall | MapFieldUnpassable |
- MapFieldLandUnit |
- MapFieldBuilding))) {
-
+ if (tmp->Tile == TheMap.Tileset->RemovedTree &&
+ tmp->Value >= ForestRegeneration &&
+ !(tmp->Flags & (MapFieldWall |
MapFieldUnpassable |
+ MapFieldLandUnit | MapFieldBuilding))) {
DebugLevel0("Real place wood\n");
tmp->Tile = TheMap.Tileset->TopOneTree;
tmp->Value = 0;
@@ -396,11 +390,11 @@
mf->Tile = TheMap.Tileset->BotOneTree;
mf->Value = 0;
mf->Flags |= MapFieldForest | MapFieldUnpassable;
- if ( IsMapFieldVisible(ThisPlayer,x,y) ) {
+ if (IsMapFieldVisible(ThisPlayer, x, y)) {
MapMarkSeenTile(x, y);
}
- if ( IsMapFieldVisible(ThisPlayer,x,y-1) ) {
- MapMarkSeenTile(x, y-1);
+ if (IsMapFieldVisible(ThisPlayer, x, y - 1)) {
+ MapMarkSeenTile(x, y - 1);
}
}
}
Index: stratagus/src/map/tileset.c
diff -u stratagus/src/map/tileset.c:1.51 stratagus/src/map/tileset.c:1.52
--- stratagus/src/map/tileset.c:1.51 Thu Sep 18 13:56:04 2003
+++ stratagus/src/map/tileset.c Sat Sep 27 16:04:24 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: tileset.c,v 1.51 2003/09/18 17:56:04 n0body Exp $
+// $Id: tileset.c,v 1.52 2003/09/27 20:04:24 jsalmon3 Exp $
//@{
@@ -97,7 +97,7 @@
int mixed;
unsigned char* data;
char* buf;
- const unsigned short *table;
+ const unsigned short* table;
//
// Find the tileset.
@@ -128,7 +128,7 @@
ShowLoadProgress("\tTileset `%s'\n", Tilesets[i]->ImageFile);
TheMap.TileData = LoadGraphic(buf);
#ifdef USE_OPENGL
-
MakeTexture(TheMap.TileData,TheMap.TileData->Width,TheMap.TileData->Height);
+ MakeTexture(TheMap.TileData, TheMap.TileData->Width,
TheMap.TileData->Height);
#endif
TileSizeX = Tilesets[i]->TileSizeX;
@@ -181,10 +181,9 @@
unsigned char *s;
unsigned char *d;
- s = ((char *)TheMap.TileData->Frames)
- + ((tile % tiles_per_row) * (TileSizeX + gap))
- + ((tile / tiles_per_row) * (TileSizeY +
- gap)) * TheMap.TileData->Width;
+ s = (char *)TheMap.TileData->Frames +
+ (tile % tiles_per_row) * (TileSizeX + gap) +
+ (tile / tiles_per_row) * (TileSizeY + gap) * TheMap.TileData->Width;
d = TheMap.Tiles[tile];
if (d != data + tile * TileSizeX * TileSizeY) {
abort();
@@ -309,50 +308,67 @@
//8 Top Left
//16 Bottom Tree Tile
//32 Top Tree Tile
- for (i = solid; i < solid + 16; i++ ) {
+ for (i = solid; i < solid + 16; ++i) {
TheMap.Tileset->MixedLookupTable[table[i]] = 15;
}
- for (i = mixed; i < mixed + 256; i++) {
- int check=(int)((i-mixed)/16);
+ for (i = mixed; i < mixed + 256; ++i) {
+ int check;
+
+ check = (int)((i - mixed) / 16);
switch (check) {
- case 0: TheMap.Tileset->MixedLookupTable[table[i]] = 8;
+ case 0:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8;
break;
- case 1: TheMap.Tileset->MixedLookupTable[table[i]] = 4;
+ case 1:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4;
break;
- case 2: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4;
+ case 2:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4;
break;
- case 3: TheMap.Tileset->MixedLookupTable[table[i]] = 1;
+ case 3:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 1;
break;
- case 4: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 1;
+ case 4:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 1;
break;
- case 5: TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 1;
+ case 5:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 1;
break;
- case 6: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 1;
+ case 6:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 1;
break;
- case 7: TheMap.Tileset->MixedLookupTable[table[i]] = 2;
+ case 7:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 2;
break;
- case 8: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2;
+ case 8:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2;
break;
- case 9: TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2;
+ case 9:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2;
break;
- case 10: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 2;
+ case 10:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 2;
break;
- case 11: TheMap.Tileset->MixedLookupTable[table[i]] = 2 + 1;
+ case 11:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 2 + 1;
break;
- case 12: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2 + 1;
+ case 12:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2 + 1;
break;
- case 13: TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2 + 1;
+ case 13:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2 + 1;
break;
- default: TheMap.Tileset->MixedLookupTable[table[i]] = 0;
+ default:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 0;
break;
}
}
//16 Bottom Tree Special
//32 Top Tree Special
//64 Mid tree special - differentiate with mixed tiles.
- TheMap.Tileset->MixedLookupTable[TheMap.Tileset->BotOneTree]=12+16;
- TheMap.Tileset->MixedLookupTable[TheMap.Tileset->TopOneTree]=3+32;
- TheMap.Tileset->MixedLookupTable[TheMap.Tileset->MidOneTree]=15+48;
+ TheMap.Tileset->MixedLookupTable[TheMap.Tileset->BotOneTree] = 12 + 16;
+ TheMap.Tileset->MixedLookupTable[TheMap.Tileset->TopOneTree] = 3 + 32;
+ TheMap.Tileset->MixedLookupTable[TheMap.Tileset->MidOneTree] = 15 + 48;
//
// Build rock removement table.
@@ -381,48 +397,65 @@
//2 Bottom Right
//4 Top Right
//8 Top Left
- for (i = solid; i < solid + 16; i++ ) {
+ for (i = solid; i < solid + 16; ++i) {
TheMap.Tileset->MixedLookupTable[table[i]] = 15;
}
- for (i = mixed; i < mixed + 256; i++) {
- int check=(int)((i-mixed)/16);
+ for (i = mixed; i < mixed + 256; ++i) {
+ int check;
+
+ check = (int)((i - mixed) / 16);
switch (check) {
- case 0: TheMap.Tileset->MixedLookupTable[table[i]] = 8;
+ case 0:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8;
break;
- case 1: TheMap.Tileset->MixedLookupTable[table[i]] = 4;
+ case 1:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4;
break;
- case 2: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4;
+ case 2:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4;
break;
- case 3: TheMap.Tileset->MixedLookupTable[table[i]] = 1;
+ case 3:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 1;
break;
- case 4: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 1;
+ case 4:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 1;
break;
- case 5: TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 1;
+ case 5:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 1;
break;
- case 6: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 1;
+ case 6:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 1;
break;
- case 7: TheMap.Tileset->MixedLookupTable[table[i]] = 2;
+ case 7:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 2;
break;
- case 8: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2;
+ case 8:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2;
break;
- case 9: TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2;
+ case 9:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2;
break;
- case 10: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 2;
+ case 10:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 4 + 2;
break;
- case 11: TheMap.Tileset->MixedLookupTable[table[i]] = 2 + 1;
+ case 11:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 2 + 1;
break;
- case 12: TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2 + 1;
+ case 12:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 8 + 2 + 1;
break;
- case 13: TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2 + 1;
+ case 13:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 4 + 2 + 1;
break;
- default: TheMap.Tileset->MixedLookupTable[table[i]] = 0;
+ default:
+ TheMap.Tileset->MixedLookupTable[table[i]] = 0;
break;
}
}
- TheMap.Tileset->MixedLookupTable[TheMap.Tileset->BotOneRock]=12+16;
- TheMap.Tileset->MixedLookupTable[TheMap.Tileset->TopOneRock]=3+32;
- TheMap.Tileset->MixedLookupTable[TheMap.Tileset->MidOneRock]=15+48;
+ TheMap.Tileset->MixedLookupTable[TheMap.Tileset->BotOneRock] = 12 + 16;
+ TheMap.Tileset->MixedLookupTable[TheMap.Tileset->TopOneRock] = 3 + 32;
+ TheMap.Tileset->MixedLookupTable[TheMap.Tileset->MidOneRock] = 15 + 48;
TheMap.Tileset->RockTable[ 0] = -1;
TheMap.Tileset->RockTable[ 1] = table[mixed + 0x30];
@@ -482,7 +515,7 @@
TheMap.Tileset->OrcWallTable[15] = 0x0C0;
// Set destroyed walls to TileTypeUnknown
- for (i=0; i<16; ++i) {
+ for (i = 0; i < 16; ++i) {
n = 0;
tile = TheMap.Tileset->HumanWallTable[i];
while (TheMap.Tileset->Table[tile]) { // Skip good tiles
@@ -501,7 +534,7 @@
++tile;
++n;
}
- while (n<16 && TheMap.Tileset->Table[tile]) {
+ while (n < 16 && TheMap.Tileset->Table[tile]) {
TheMap.Tileset->TileTypeTable[
TheMap.Tileset->Table[tile]] = TileTypeUnknown;
++tile;
@@ -578,7 +611,7 @@
CLprintf(file, " 'solid (list \"%s\"", name);
SaveTilesetFlags(file, flags);
// Remove empty tiles at end of block
- for (n = 15; n >= 0 && !table[start + n]; n--) {
+ for (n = 15; n >= 0 && !table[start + n]; --n) {
}
i = CLprintf(file, "\n #(");
for (j = 0; j <= n; ++j) {
@@ -613,20 +646,20 @@
CLprintf(file, " 'mixed (list \"%s\" \"%s\"", name1, name2);
SaveTilesetFlags(file, flags);
- CLprintf(file,"\n");
+ CLprintf(file, "\n");
for (x = 0; x < 0x100; x += 0x10) {
if (start + x >= end) { // Check end must be 0x10 aligned
break;
}
CLprintf(file, " #(");
// Remove empty slots at end of table
- for (n = 15; n >= 0 && !table[start + x + n]; n--) {
+ for (n = 15; n >= 0 && !table[start + x + n]; --n) {
}
i = 6;
for (j = 0; j <= n; ++j) {
i += CLprintf(file, " %3d", table[start + x + j]);
}
- if (x == 0xF0 ) {
+ if (x == 0xF0) {
i += CLprintf(file, "))");
} else {
i += CLprintf(file, ")");
@@ -645,7 +678,7 @@
** @param file Output file.
** @param tileset Save the content of this tileset.
*/
-local void SaveTileset(CLFile*file, const Tileset* tileset)
+local void SaveTileset(CLFile* file, const Tileset* tileset)
{
const unsigned short* table;
int i;
@@ -657,8 +690,7 @@
CLprintf(file, "\n 'image \"%s\"", tileset->ImageFile);
CLprintf(file, "\n 'palette \"%s\"", tileset->PaletteFile);
CLprintf(file, "\n ;; Slots descriptions");
- CLprintf(file,
- "\n 'slots (list\n 'special (list\t\t;; Can't be in pud\n");
+ CLprintf(file, "\n 'slots (list\n 'special (list\t\t;; Can't be in
pud\n");
CLprintf(file, " 'top-one-tree %d 'mid-one-tree %d 'bot-one-tree %d\n",
tileset->TopOneTree, tileset->MidOneTree, tileset->BotOneTree);
CLprintf(file, " 'removed-tree %d\n", tileset->RemovedTree);
@@ -708,8 +740,7 @@
char** sp;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file,
- ";;; MODULE: tileset $Id: tileset.c,v 1.51 2003/09/18 17:56:04 n0body
Exp $\n\n");
+ CLprintf(file, ";;; MODULE: tileset $Id: tileset.c,v 1.52 2003/09/27
20:04:24 jsalmon3 Exp $\n\n");
// Original number to internal tileset name
@@ -743,7 +774,7 @@
//
// Free the tilesets
//
- for( i=0; i<NumTilesets; ++i ) {
+ for (i = 0; i < NumTilesets; ++i) {
free(Tilesets[i]->Ident);
free(Tilesets[i]->Class);
free(Tilesets[i]->Name);
@@ -754,7 +785,7 @@
free(Tilesets[i]->Tiles);
free(Tilesets[i]->TileTypeTable);
free(Tilesets[i]->AnimationTable);
- for( j=0; j<Tilesets[i]->NumTerrainTypes; ++j ) {
+ for (j = 0; j < Tilesets[i]->NumTerrainTypes; ++j) {
free(Tilesets[i]->SolidTerrainTypes[j].TerrainName);
}
free(Tilesets[i]->SolidTerrainTypes);
@@ -762,27 +793,27 @@
free(Tilesets[i]);
}
free(Tilesets);
- Tilesets=NULL;
- NumTilesets=0;
+ Tilesets = NULL;
+ NumTilesets = 0;
//
// Should this be done by the map?
//
VideoSaveFree(TheMap.TileData);
- TheMap.TileData=NULL;
+ TheMap.TileData = NULL;
free(TheMap.Tiles);
- TheMap.Tiles=NULL;
+ TheMap.Tiles = NULL;
//
// Mapping the original tileset numbers in puds to our internal strings
//
- if( (ptr=TilesetWcNames) ) { // Free all old names
- while( *ptr ) {
+ if ((ptr = TilesetWcNames)) { // Free all old names
+ while (*ptr) {
free(*ptr++);
}
free(TilesetWcNames);
- TilesetWcNames=NULL;
+ TilesetWcNames = NULL;
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src/map map_wall.c map_wood.c tileset.c,
Jimmy Salmon <=