edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed tilemap rendering abit, editor.cfg added

Browse source
This commit is contained in:
Magnus Auvinen 2007-07-22 11:25:15 +00:00
parent f5e9c741f2
commit 38b8de5438
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/editor/editor.cpp
View file

@ -5,6 +5,7 @@
#include <engine/interface.h> #include <engine/interface.h>
#include <engine/datafile.h> #include <engine/datafile.h>
#include <engine/config.h>
#include <engine/client/ui.h> #include <engine/client/ui.h>
#include <game/client/mapres_image.h> #include <game/client/mapres_image.h>
@ -34,6 +35,7 @@ static ent_type ent_types[] = {
{"hammer", MAPRES_ITEM, ITEM_WEAPON_HAMMER}, {"hammer", MAPRES_ITEM, ITEM_WEAPON_HAMMER},
{"health", MAPRES_ITEM, ITEM_HEALTH}, {"health", MAPRES_ITEM, ITEM_HEALTH},
{"armor", MAPRES_ITEM, ITEM_ARMOR}, {"armor", MAPRES_ITEM, ITEM_ARMOR},
{"ninja", MAPRES_ITEM, ITEM_NINJA},
{0, 0} {0, 0}
}; };
@ -312,7 +314,7 @@ static tileset *tilesets_get(int index)
*********************************************************/ *********************************************************/
static void render_tilemap(tilemap *tm, float sx, float sy, float scale) static void render_tilemap(tilemap *tm, float sx, float sy, float scale)
{ {
float frac = (1.0f/512.0f); //2.0f; float frac = (1.0f/1024.0f); //2.0f;
gfx_quads_begin(); gfx_quads_begin();
for(int y = 0; y < tm->height; y++) for(int y = 0; y < tm->height; y++)
for(int x = 0; x < tm->width; x++) for(int x = 0; x < tm->width; x++)
@ -1208,6 +1210,8 @@ int editor_main(int argc, char **argv)
{ {
dbg_msg("editor", "starting..."); dbg_msg("editor", "starting...");
config_load("editor.cfg");
// parse arguments // parse arguments
for(int i = 1; i < argc; i++) for(int i = 1; i < argc; i++)
{ {