Changeset 221 for trunk/deushax


Ignore:
Timestamp:
Jan 18, 2011, 12:05:18 AM (11 years ago)
Author:
sam
Message:

Complete Lol Engine / Deus Hax / Monsterz split.

Location:
trunk/deushax
Files:
3 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/deushax/Makefile.am

    r220 r221  
    22noinst_PROGRAMS = deushax editor
    33
    4 deushax_SOURCES = deushax.cpp
     4deushax_SOURCES = deushax.cpp game.cpp game.h debugsprite.cpp debugsprite.h
    55deushax_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    66deushax_LDADD = $(top_builddir)/src/liblol.a
  • trunk/deushax/debugsprite.cpp

    r220 r221  
    11//
    22// Deus Hax (working title)
    3 // Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     3// Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
    44//
    55
     
    3737    data->game = game;
    3838    Ticker::Ref(game);
    39     data->tiler = Tiler::Register("art/test/character-dress.png", 32);
     39    data->tiler = Tiler::Register("art/test/character-dress.png", 32, 32);
    4040    data->x = 320;
    4141    data->y = 206;
  • trunk/deushax/deushax.cpp

    r220 r221  
    11//
    22// Deus Hax (working title)
    3 // Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     3// Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
    44//
    55
     
    1717
    1818#include "core.h"
     19#include "game.h"
    1920#include "sdlinput.h"
    2021#include "debugfps.h"
    21 #include "debugboard.h"
    2222#include "debugsprite.h"
    2323#include "debugsphere.h"
     
    6464    new DebugFps();
    6565    new DebugSprite(game);
    66     new DebugBoard(game);
    6766    new DebugSphere();
    6867    //new DebugRecord("lolengine.ogg");
  • trunk/deushax/game.cpp

    r220 r221  
    11//
    22// Deus Hax (working title)
    3 // Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     3// Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
    44//
    55
     
    1111
    1212#include "core.h"
     13#include "game.h"
    1314
    1415/*
  • trunk/deushax/gtk/editor.cpp

    r220 r221  
    11//
    22// Deus Hax (working title)
    3 // Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     3// Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
    44//
    55
     
    4040    /* Build the application interface */
    4141    GtkBuilder *builder = gtk_builder_new();
    42     if (!gtk_builder_add_from_file(builder, "src/gtk/editor.xml", NULL))
     42    if (!gtk_builder_add_from_file(builder, "deushax/gtk/editor.xml", NULL))
    4343    {
    4444        g_print("Cannot build from XML\n");
Note: See TracChangeset for help on using the changeset viewer.