diff --git a/client/gameplay_scenes/world_logic.cpp b/client/gameplay_scenes/world_logic.cpp index c652685..51c06af 100644 --- a/client/gameplay_scenes/world_logic.cpp +++ b/client/gameplay_scenes/world_logic.cpp @@ -64,7 +64,7 @@ World::World(int* const argClientIndex, int* const argAccountIndex): //load the tilesheet //TODO: (2) Tile size and tile sheet should be loaded elsewhere - tileSheet.Load(GetRenderer(), config["dir.tilesets"] + "overworld.bmp", 32, 32); + tileSheet.Load(GetRenderer(), config["dir.tilesets"] + "overworld.png", 32, 32); //Send the character data CharacterPacket newPacket; diff --git a/instructions.txt b/instructions.txt index 85fcaf9..bf75ada 100644 --- a/instructions.txt +++ b/instructions.txt @@ -26,8 +26,8 @@ Instructions For Setup 5. There are currently two options for 'client.avatar': -* client.avatar = elliot2.bmp #male -* client.avatar = coa2.bmp #female +* client.avatar = character1.png #male +* client.avatar = character2.png #female 6. When you've correctly set these values, run client.exe, and select 'Start' from the main menu; this displays the list of available servers. diff --git a/rsc/config.cfg b/rsc/config.cfg index cf72bdc..c43320d 100644 --- a/rsc/config.cfg +++ b/rsc/config.cfg @@ -17,7 +17,7 @@ client.font = /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf client.username = username client.handle = handle -client.avatar = elliot2.bmp +client.avatar = character2.png #directories dir.logos = rsc/graphics/logos/ diff --git a/rsc/graphics/sprites/aniflower.bmp b/rsc/graphics/sprites/aniflower.bmp deleted file mode 100644 index fbc60f5..0000000 Binary files a/rsc/graphics/sprites/aniflower.bmp and /dev/null differ diff --git a/rsc/graphics/sprites/aniflower.png b/rsc/graphics/sprites/aniflower.png new file mode 100644 index 0000000..ffc136b Binary files /dev/null and b/rsc/graphics/sprites/aniflower.png differ diff --git a/rsc/graphics/sprites/character1.png b/rsc/graphics/sprites/character1.png new file mode 100644 index 0000000..fa30aa4 Binary files /dev/null and b/rsc/graphics/sprites/character1.png differ diff --git a/rsc/graphics/sprites/character2.png b/rsc/graphics/sprites/character2.png new file mode 100644 index 0000000..edfcaee Binary files /dev/null and b/rsc/graphics/sprites/character2.png differ diff --git a/rsc/graphics/sprites/coa2.bmp b/rsc/graphics/sprites/coa2.bmp deleted file mode 100644 index bd7b3c0..0000000 Binary files a/rsc/graphics/sprites/coa2.bmp and /dev/null differ diff --git a/rsc/graphics/sprites/elliot2.bmp b/rsc/graphics/sprites/elliot2.bmp deleted file mode 100644 index 89f66d8..0000000 Binary files a/rsc/graphics/sprites/elliot2.bmp and /dev/null differ diff --git a/rsc/graphics/sprites/skume1.bmp b/rsc/graphics/sprites/skume1.bmp deleted file mode 100644 index ae31c9a..0000000 Binary files a/rsc/graphics/sprites/skume1.bmp and /dev/null differ diff --git a/rsc/graphics/sprites/skume1.png b/rsc/graphics/sprites/skume1.png new file mode 100644 index 0000000..9ec6092 Binary files /dev/null and b/rsc/graphics/sprites/skume1.png differ diff --git a/rsc/graphics/sprites/skume2.bmp b/rsc/graphics/sprites/skume2.bmp deleted file mode 100644 index b2c5623..0000000 Binary files a/rsc/graphics/sprites/skume2.bmp and /dev/null differ diff --git a/rsc/graphics/sprites/skume2.png b/rsc/graphics/sprites/skume2.png new file mode 100644 index 0000000..503cf71 Binary files /dev/null and b/rsc/graphics/sprites/skume2.png differ diff --git a/rsc/graphics/tilesets/MishMash.bmp b/rsc/graphics/tilesets/MishMash.bmp deleted file mode 100644 index 36093a8..0000000 Binary files a/rsc/graphics/tilesets/MishMash.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/blank.bmp b/rsc/graphics/tilesets/blank.bmp deleted file mode 100644 index 44b11c7..0000000 Binary files a/rsc/graphics/tilesets/blank.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/dirt.bmp b/rsc/graphics/tilesets/dirt.bmp deleted file mode 100644 index 089ba2a..0000000 Binary files a/rsc/graphics/tilesets/dirt.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/grass.bmp b/rsc/graphics/tilesets/grass.bmp deleted file mode 100644 index ac8c6e4..0000000 Binary files a/rsc/graphics/tilesets/grass.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/longgrass.bmp b/rsc/graphics/tilesets/longgrass.bmp deleted file mode 100644 index 8561d29..0000000 Binary files a/rsc/graphics/tilesets/longgrass.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/overworld.bmp b/rsc/graphics/tilesets/overworld.bmp deleted file mode 100644 index d9cc0c6..0000000 Binary files a/rsc/graphics/tilesets/overworld.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/overworld.png b/rsc/graphics/tilesets/overworld.png new file mode 100644 index 0000000..a09df17 Binary files /dev/null and b/rsc/graphics/tilesets/overworld.png differ diff --git a/rsc/graphics/tilesets/sand.bmp b/rsc/graphics/tilesets/sand.bmp deleted file mode 100644 index c5f156a..0000000 Binary files a/rsc/graphics/tilesets/sand.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/terrain.bmp b/rsc/graphics/tilesets/terrain.bmp deleted file mode 100644 index 0a39c74..0000000 Binary files a/rsc/graphics/tilesets/terrain.bmp and /dev/null differ diff --git a/rsc/graphics/tilesets/terrain.png b/rsc/graphics/tilesets/terrain.png new file mode 100644 index 0000000..3966d5e Binary files /dev/null and b/rsc/graphics/tilesets/terrain.png differ diff --git a/rsc/graphics/tilesets/water.bmp b/rsc/graphics/tilesets/water.bmp deleted file mode 100644 index 2c3f33e..0000000 Binary files a/rsc/graphics/tilesets/water.bmp and /dev/null differ