Changeset 100


Ignore:
Timestamp:
Aug 11, 2010, 6:18:40 PM (10 years ago)
Author:
sam
Message:

Slightly improve the documentation in a few files, add the missing
joystick class, and put a header in each source file.

Location:
trunk
Files:
2 added
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r99 r100  
    55
    66libcommon_a_SOURCES = \
    7     game.cpp tiler.cpp tileset.cpp scene.cpp \
    8     font.cpp layer.cpp map.cpp joystick.cpp \
    9     asset.h asset.cpp ticker.h ticker.cpp
     7    game.cpp game.h tiler.cpp tiler.h tileset.cpp tileset.h \
     8    scene.cpp scene.h font.cpp font.h layer.cpp layer.h map.cpp map.h \
     9    joystick.cpp joystick.h asset.cpp asset.h ticker.cpp ticker.h
    1010libcommon_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
    1111
    12 test_map_SOURCES = test-map.cpp sdlvideo.cpp
     12test_map_SOURCES = test-map.cpp sdlvideo.cpp sdlvideo.h
    1313test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
    1414test_map_LDADD = libcommon.a
    1515test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image`
    1616
    17 editor_SOURCES = gtk/editor.cpp gtk/gtkvideo.cpp
     17editor_SOURCES = gtk/editor.cpp gtk/gtkvideo.cpp gtk/gtkvideo.h
    1818editor_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image gtk+-2.0 gtkgl-2.0`
    1919editor_LDADD = libcommon.a
  • trunk/src/asset.cpp

    r98 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <cstdlib>
  • trunk/src/asset.h

    r98 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The asset object
    4  */
     6//
     7// The Asset class
     8// ---------------
     9// Assets are objects that can be ticked by the game loop and/or the render
     10// loop. Assets are implemented as one or several linked lists. See the
     11// Ticker class for the ticking logic and the linked list implementation.
     12//
    513
    614#if !defined __DH_ASSET_H__
  • trunk/src/font.cpp

    r87 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#ifdef WIN32
  • trunk/src/font.h

    r87 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The font object
    4  */
     6//
     7// The Font class
     8// --------------
     9//
    510
    611#if !defined __DH_FONT_H__
  • trunk/src/game.cpp

    r87 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <cstdio>
  • trunk/src/game.h

    r79 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The game object
    4  */
     6//
     7// The Game class
     8// --------------
     9//
    510
    611#if !defined __DH_GAME_H__
  • trunk/src/gtk/editor.cpp

    r99 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <cstdio>
  • trunk/src/gtk/gtkvideo.cpp

    r99 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <cstdlib>
  • trunk/src/gtk/gtkvideo.h

    r99 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The video driver
    4  */
     6//
     7// The GtkVideo class
     8// ------------------
     9//
    510
    611#if !defined __DH_GTKVIDEO_H__
     
    1722    virtual ~GtkVideo();
    1823
    19     // New
    20     void *GetWidget();
    21 
    2224    // Inherited
    2325    virtual int GetWidth() const;
     
    2729    virtual void FullScreen();
    2830
     31    // New
     32    void *GetWidget();
     33
    2934private:
    3035    GtkVideoData *data;
  • trunk/src/layer.cpp

    r79 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <stdlib.h>
  • trunk/src/layer.h

    r79 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The layer object
    4  */
     6//
     7// The Layer class
     8// ---------------
     9// A Layer object is a subset of a Map.
     10//
    511
    612#if !defined __DH_LAYER_H__
  • trunk/src/map.cpp

    r98 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <cstdio>
  • trunk/src/map.h

    r79 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The map object
    4  */
     6//
     7// The Map class
     8// -------------
     9// A Map object is a collection of Layers and other information (to be
     10// determined later).
     11//
    512
    613#if !defined __DH_MAP_H__
  • trunk/src/scene.cpp

    r79 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <stdlib.h>
  • trunk/src/scene.h

    r79 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The scene object
    4  */
     6//
     7// The Scene class
     8// ---------------
     9//
    510
    611#if !defined __DH_SCENE_H__
  • trunk/src/sdlvideo.cpp

    r93 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#ifdef WIN32
  • trunk/src/sdlvideo.h

    r93 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The video driver
    4  */
     6//
     7// The SdlVideo class
     8// ------------------
     9//
    510
    611#if !defined __DH_SDLVIDEO_H__
  • trunk/src/test-map.cpp

    r98 r100  
    1 // Test stuff
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    29
    310#include <cstdio>
  • trunk/src/ticker.cpp

    r98 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The ticker
    4  */
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    59
    610#include <cstdlib>
  • trunk/src/ticker.h

    r94 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The tick manager
    4  */
     6//
     7// The Ticker class
     8// ----------------
     9// The Ticker is a static class that registers assets and ticks them.
     10//
    511
    612#if !defined __DH_TICKER_H__
  • trunk/src/tiler.cpp

    r98 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <cstring>
  • trunk/src/tiler.h

    r79 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The tile manager
    4  */
     6//
     7// The Tiler class
     8// ---------------
     9// The Tiler is a static class that manages tilesets.
     10//
    511
    612#if !defined __DH_TILER_H__
  • trunk/src/tileset.cpp

    r98 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
     5
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    19
    210#include <cstdlib>
  • trunk/src/tileset.h

    r96 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The tile manager
    4  */
     6//
     7// The TileSet class
     8// -----------------
     9// A TileSet contains the information necesary to blit tiles to the game
     10// screen.
     11//
    512
    613#if !defined __DH_TILESET_H__
  • trunk/src/video.h

    r93 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 /*
    3  * The video interface
    4  */
     6//
     7// The Video interface
     8// -------------------
     9// Not sure yet whether this should exist.
     10//
    511
    612#if !defined __DH_VIDEO_H__
     
    1016{
    1117public:
    12     //Video(char const *title, int width, int height);
    13     //virtual ~Video();
    14 
    1518    virtual int GetWidth() const = 0;
    1619    virtual int GetHeight() const = 0;
  • trunk/tools/make-font.cpp

    r85 r100  
     1//
     2// Deus Hax (working title)
     3// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
     4//
    15
    2 #include <caca.h>
     6#if defined HAVE_CONFIG_H
     7#   include "config.h"
     8#endif
    39
    410#include <cstdlib>
    511#include <cstdio>
     12
     13#include <caca.h>
    614
    715int main(void)
     
    1826    free(buffer);
    1927
    20     /* Free everything */
    2128    caca_free_canvas(cv);
    2229
Note: See TracChangeset for help on using the changeset viewer.