Skip to content
This repository has been archived by the owner on Aug 3, 2021. It is now read-only.

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
Added food, stone and gold
  • Loading branch information
switchboy committed Apr 3, 2020
1 parent 8b23d26 commit 20e7354
Show file tree
Hide file tree
Showing 10 changed files with 236 additions and 117 deletions.
2 changes: 2 additions & 0 deletions include/gamestate.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@ class gameState
sf::Sprite spriteSelectedTile,spriteSelectedTileForPath, spriteEmptyTile, spriteGrassTile, spriteSandTile, spriteSandTileNE,
spriteSandTileNW,spriteSandTileSE,spriteSandTileSW, spriteCactusTile, spriteCypressTrileTile,
spriteNormalTreeTile, spritePineTreeTile, spriteTileObstructed, spriteTownCenter,
spriteStone, spriteGold, spriteBerryBush,
spriteWaterTile, spriteBeachTileNE, spriteBeachTileNW,spriteBeachTileSE,spriteBeachTileSW, spriteBuildingHouse, spriteVillager;

sf::Texture textureSelectedTile, textureSelectedTileForPath, textureEmptyTile, textureGrassTile, textureSandTile, textureSandTileNE,
textureSandTileNW,textureSandTileSE,textureSandTileSW, textureCactusTile, textureCypressTrileTile,
textureNormalTreeTile, texturePineTreeTile, textureCheatTile, textureTileObstructed, textureTownCenter,
textureStone, textureGold, textureBerryBush,
textureWaterTile, textureBeachTileNE, textureBeachTileNW,textureBeachTileSE, textureBeachTileSW, textureBuildingHouse, textureVillager;
int currentMap[MAP_WIDTH][MAP_HEIGHT];
int buildingLocationList[MAP_WIDTH][MAP_HEIGHT];
Expand Down
8 changes: 4 additions & 4 deletions isometric.depend
Original file line number Diff line number Diff line change
Expand Up @@ -442,11 +442,11 @@

1584718378 d:\programming\isometric\include\animation.h

1585842920 d:\programming\isometric\include\gamestate.h
1585907947 d:\programming\isometric\include\gamestate.h
<SFML/Graphics.hpp>
"globalfunctions.h"

1585859107 source:d:\programming\isometric\src\gamestate.cpp
1585908534 source:d:\programming\isometric\src\gamestate.cpp
"gamestate.h"
"buildings.h"
"objects.h"
Expand Down Expand Up @@ -479,13 +479,13 @@
1585852846 d:\programming\isometric\include\objects.h
<vector>

1585853715 source:d:\programming\isometric\src\objects.cpp
1585922853 source:d:\programming\isometric\src\objects.cpp
"objects.h"
"gamestate.h"

1584720289 d:\programming\isometric\globals.h

1585855318 source:d:\programming\isometric\src\actors.cpp
1585922448 source:d:\programming\isometric\src\actors.cpp
"actors.h"
"objects.h"
"player.h"
Expand Down
60 changes: 30 additions & 30 deletions isometric.layout
Original file line number Diff line number Diff line change
Expand Up @@ -2,79 +2,79 @@
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
<File name="src\actors.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src\animation.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="21270" topLine="525" />
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="main.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="include\gamestate.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="299" topLine="0" />
<Cursor1 position="1637" topLine="24" />
</Cursor>
</File>
<File name="include\buildings.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="include\globalfunctions.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="628" topLine="0" />
<Cursor1 position="75" topLine="0" />
</Cursor>
</File>
<File name="include\actors.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src\actors.cpp" open="1" top="1" tabpos="5" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="95" topLine="0" />
<Cursor1 position="24156" topLine="554" />
</Cursor>
</File>
<File name="src\animation.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src\buildings.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
<Cursor1 position="1972" topLine="75" />
</Cursor>
</File>
<File name="src\objects.cpp" open="1" top="1" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src\gamestate.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="567" topLine="0" />
<Cursor1 position="6173" topLine="169" />
</Cursor>
</File>
<File name="include\animation.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src\globalfunctions.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
<Cursor1 position="928" topLine="0" />
</Cursor>
</File>
<File name="src\gamestate.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src\objects.cpp" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="-1" zoom_2="0">
<Cursor>
<Cursor1 position="30919" topLine="820" />
<Cursor1 position="789" topLine="0" />
</Cursor>
</File>
<File name="src\globalfunctions.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="src\player.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="928" topLine="0" />
<Cursor1 position="1690" topLine="66" />
</Cursor>
</File>
<File name="src\player.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1690" topLine="66" />
<Cursor1 position="519" topLine="0" />
</Cursor>
</File>
<File name="include\gamestate.h" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="include\objects.h" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="631" topLine="5" />
<Cursor1 position="610" topLine="0" />
</Cursor>
</File>
<File name="include\globalfunctions.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="include\animation.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="75" topLine="0" />
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="include\actors.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="519" topLine="0" />
<Cursor1 position="563" topLine="0" />
</Cursor>
</File>
<File name="src\buildings.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="main.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1972" topLine="75" />
<Cursor1 position="299" topLine="0" />
</Cursor>
</File>
<File name="include\objects.h" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="include\buildings.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="610" topLine="0" />
<Cursor1 position="628" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>
Loading

0 comments on commit 20e7354

Please sign in to comment.