Changeset 724


Ignore:
Timestamp:
Sep 26, 2013, 5:28:08 PM (9 years ago)
Author:
Sam Hocevar
Message:

build: merge all static libraries into a single one.

Location:
abuse/branches/lol/src
Files:
4 deleted
115 edited

Legend:

Unmodified
Added
Removed
  • abuse/branches/lol/src/Makefile.am

    r716 r724  
    22include $(top_srcdir)/build/autotools/common.am
    33
    4 SUBDIRS = lisp net imlib sdlport
     4bin_PROGRAMS = abuse abuse-tool
    55
    6 bin_PROGRAMS = abuse abuse-tool
     6noinst_LIBRARIES = libabuse.a
    77
    88abuse_SOURCES = \
     
    6464    ui/volumewindow.cpp ui/volumewindow.h \
    6565    $(NULL)
    66 
    67 EXTRALIBS = lisp/liblisp.a sdlport/libsdlport.a imlib/libimlib.a net/libnet.a
    68 EXTRAINCLUDES = -I$(srcdir) -I$(srcdir)/lisp -I$(srcdir)/imlib -I$(srcdir)/net
    69 
    70 abuse_CPPFLAGS = $(EXTRAINCLUDES) $(AM_CPPFLAGS)
    71 abuse_LDFLAGS = $(EXTRALIBS) $(AM_LDFLAGS)
     66abuse_CPPFLAGS = $(AM_CPPFLAGS)
     67abuse_LDFLAGS = libabuse.a $(AM_LDFLAGS)
    7268abuse_LDADD = @LOL_LIBS@
    73 abuse_DEPENDENCIES = $(EXTRALIBS) @LOL_DEPS@
     69abuse_DEPENDENCIES = libabuse.a @LOL_DEPS@
    7470
    7571abuse_tool_SOURCES = \
    7672    tool/abuse-tool.cpp \
    7773    crc.cpp crc.h
    78 abuse_tool_CPPFLAGS = $(EXTRAINCLUDES) $(AM_CPPFLAGS)
    79 abuse_tool_LDFLAGS = $(EXTRALIBS) $(AM_LDFLAGS)
     74abuse_tool_CPPFLAGS = $(AM_CPPFLAGS)
     75abuse_tool_LDFLAGS = libabuse.a $(AM_LDFLAGS)
    8076abuse_tool_LDADD = @LOL_LIBS@
    81 abuse_tool_DEPENDENCIES = $(EXTRALIBS) @LOL_DEPS@
     77abuse_tool_DEPENDENCIES = libabuse.a @LOL_DEPS@
    8278
     79libabuse_a_SOURCES = \
     80    imlib/filter.cpp imlib/filter.h \
     81    imlib/image.cpp imlib/image.h \
     82    imlib/transimage.cpp imlib/transimage.h \
     83    imlib/input.cpp imlib/input.h \
     84    imlib/palette.cpp imlib/palette.h \
     85    imlib/include.cpp imlib/include.h \
     86    imlib/fonts.cpp imlib/fonts.h \
     87    imlib/specs.cpp imlib/specs.h \
     88    imlib/supmorph.cpp imlib/supmorph.h \
     89    imlib/pcxread.cpp imlib/pcxread.h \
     90    imlib/keys.cpp imlib/keys.h \
     91    imlib/dprint.cpp imlib/dprint.h \
     92    imlib/status.cpp imlib/status.h \
     93    imlib/pmenu.cpp imlib/pmenu.h \
     94    imlib/scroller.cpp imlib/scroller.h \
     95    imlib/filesel.cpp imlib/filesel.h \
     96    imlib/tools.cpp imlib/tools.h \
     97    imlib/guistat.cpp imlib/guistat.h \
     98    imlib/sprite.cpp imlib/sprite.h \
     99    imlib/window.cpp imlib/window.h \
     100    imlib/video.cpp imlib/video.h \
     101    imlib/event.cpp imlib/event.h \
     102    imlib/jdir.h imlib/visobj.h \
     103    \
     104    lisp/lisp.cpp lisp/lisp.h \
     105    lisp/lisp_opt.cpp lisp/lisp_opt.h \
     106    lisp/lisp_gc.cpp lisp/lisp_gc.h \
     107    lisp/trig.cpp \
     108    lisp/stack.h lisp/symbols.h \
     109    \
     110    net/gserver.cpp net/gserver.h \
     111    net/gclient.cpp net/gclient.h \
     112    net/fileman.cpp net/fileman.h \
     113    net/sock.cpp net/sock.h \
     114    net/tcpip.cpp net/tcpip.h \
     115    net/ghandler.h net/undrv.h \
     116    \
     117    sdlport/video.cpp \
     118    sdlport/event.cpp \
     119    sdlport/sound.cpp sdlport/sound.h \
     120    sdlport/jdir.cpp \
     121    sdlport/joystick.cpp sdlport/joy.h \
     122    sdlport/setup.cpp sdlport/setup.h \
     123    sdlport/hmi.cpp sdlport/hmi.h \
     124    $(NULL)
     125libabuse_a_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. $(AM_CPPFLAGS) -DASSETDIR=\"$(assetdir)\"
     126
  • abuse/branches/lol/src/automap.h

    r715 r724  
    1212#define __AUTOMAP_HPP_
    1313
    14 #include "window.h"
     14#include "imlib/window.h"
     15
    1516#include "level.h"
    1617
     
    2122  int tick,w,h;                // used to draw your position as a blinking spot
    2223  long old_dx,old_dy;
    23 public :
     24
     25public:
    2426  automap(Level *l, int width, int height);
    2527  void toggle_window();
     
    2729  void draw();
    2830  ~automap() { if (automap_window) toggle_window(); }
    29 } ;
     31};
    3032
    3133extern automap *current_automap;
     
    3335#endif
    3436
    35 
  • abuse/branches/lol/src/cache.cpp

    r715 r724  
    2222#include "common.h"
    2323
     24#include "lisp/lisp.h"
     25#include "lisp/lisp_gc.h"
     26
     27#include "imlib/video.h"
     28#include "imlib/dprint.h"
     29#include "imlib/status.h"
     30
     31#include "lcache.h"
    2432#include "cache.h"
    25 #include "lisp.h"
    26 #include "video.h"
    27 #include "dprint.h"
    28 #include "lcache.h"
    29 #include "status.h"
    3033#include "game.h"
    31 #include "lisp_gc.h"
    3234#include "level.h"
    33 #include "status.h"
    3435#include "crc.h"
    3536#include "dev.h"
  • abuse/branches/lol/src/cache.h

    r713 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    99 */
    1010
    11 #ifndef __CASHE_HPP_
    12 #define __CASHE_HPP_
     11#ifndef __CACHE_HPP_
     12#define __CACHE_HPP_
    1313
    1414#include <stdlib.h>
    1515
    1616#include "lisp/lisp.h"
     17
     18#include "imlib/specs.h"
     19
    1720#include "sdlport/sound.h"
    1821
    19 #include "specs.h"
    2022#include "items.h"
    2123#include "particle.h"
  • abuse/branches/lol/src/chars.cpp

    r715 r724  
    1515#include "common.h"
    1616
     17#include "lisp/lisp.h"
     18#include "lisp/lisp_gc.h"
     19
     20#include "imlib/window.h"
     21#include "imlib/input.h"
     22#include "imlib/dprint.h"
     23
    1724#include "chars.h"
    1825#include "game.h"
    1926#include "intsect.h"
    20 #include "lisp.h"
    21 #include "window.h"
    22 #include "input.h"
    2327#include "id.h"
    2428#include "clisp.h"
    25 #include "dprint.h"
    26 #include "lisp_gc.h"
    2729
    2830#define FADING_FRAMES 26
  • abuse/branches/lol/src/chars.h

    r719 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1313
    1414#include <string.h>
    15 
    16 #include "seq.h"
    17 //#include "sound.h"
    18 #include "ability.h"
    19 #include "event.h"
    2015#include <stdarg.h>
    2116#include <time.h>
    2217
     18#include "imlib/event.h"
     19
     20#include "seq.h"
     21#include "ability.h"
    2322
    2423enum character_state
  • abuse/branches/lol/src/clisp.cpp

    r723 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include <string.h>
    1616
     17#if defined HAVE_UNISTD_H
     18#   include <unistd.h> /* for getcwd */
     19#endif
     20
    1721#include "common.h"
    1822
     23#include "lisp/lisp.h"
     24#include "lisp/lisp_gc.h"
     25
     26#include "imlib/pcxread.h"
     27#include "imlib/dprint.h"
     28#include "imlib/jdir.h"
     29
    1930#include "sdlport/joy.h"
    2031
    2132#include "ant.h"
    22 #include "lisp/lisp.h"
    2333#include "game.h"
    2434#include "dev.h"
    25 #include "imlib/pcxread.h"
    2635#include "menu.h"
    27 #include "lisp/dprint.h"
    28 #include "lisp/lisp_gc.h"
    2936#include "clisp.h"
    3037#include "chars.h"
     
    3441#include "demo.h"
    3542#include "chat.h"
    36 #include "imlib/jdir.h"
    3743#include "netcfg.h"
    3844
     
    939945    case 54 :
    940946    {
    941 #if defined __CELLOS_LV2__
    942       /* FIXME: retrieve the PS3 account name */
    943       char const *cd = "Player";
    944 #else
     947#if defined HAVE_UNISTD_H
    945948      char cd[150];
    946949      getcwd(cd, 100);
     950#else
     951      /* FIXME: maybe retrieve the PS3 account name etc.? */
     952      char const *cd = "Player";
    947953#endif
    948954      return LString::Create(cd);
  • abuse/branches/lol/src/configuration.cpp

    r715 r724  
    1717#include "common.h"
    1818
     19#include "lisp/lisp.h"
     20
     21#include "imlib/keys.h"
     22#include "imlib/window.h"
     23
    1924#include "sdlport/joy.h"
     25
    2026#include "game.h"
    21 
    22 #include "keys.h"
    23 #include "lisp.h"
    24 #include "window.h"
    2527#include "configuration.h"
    2628
  • abuse/branches/lol/src/control.cpp

    r691 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1313#endif
    1414
     15#include "imlib/specs.h"
     16
    1517#include "game.h"
    1618#include "control.h"
    17 #include "specs.h"
    1819#include "hpoint.h"
    1920#include "ability.h"
  • abuse/branches/lol/src/cop.cpp

    r719 r724  
    1515#include "common.h"
    1616
    17 #include "lisp.h"
    18 #include "lisp_gc.h"
     17#include "lisp/lisp.h"
     18#include "lisp/lisp_gc.h"
     19
    1920#include "compiled.h"
    2021#include "objects.h"
  • abuse/branches/lol/src/crc.h

    r690 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define _CRC_HPP_
    1313
    14 #include "specs.h"
     14#include "imlib/specs.h"
    1515
    1616class Crc
  • abuse/branches/lol/src/demo.cpp

    r716 r724  
    1515#include "common.h"
    1616
    17 #include "game.h"
    18 
    19 #include "demo.h"
    20 #include "specs.h"
    21 #include "window.h"
    22 #include "dprint.h"
     17#include "lisp/lisp.h"
     18
     19#include "imlib/specs.h"
     20#include "imlib/window.h"
     21#include "imlib/dprint.h"
     22
    2323#include "dev.h"
    24 #include "lisp.h"
    2524#include "clisp.h"
    2625#include "netface.h"
    27 
     26#include "game.h"
     27#include "demo.h"
    2828
    2929demo_manager demo_man;
  • abuse/branches/lol/src/demo.h

    r716 r724  
    1212#define __DEMO_HPP_
    1313
    14 #include "lisp.h"
    15 #include "window.h"
     14#include "lisp/lisp.h"
     15
     16#include "imlib/window.h"
    1617
    1718class demo_manager
  • abuse/branches/lol/src/dev.cpp

    r716 r724  
    1818#include "common.h"
    1919
     20#include "lisp/lisp.h"
     21#include "lisp/lisp_gc.h"
     22
     23#include "imlib/input.h"
     24#include "imlib/dprint.h"
     25#include "imlib/pmenu.h"
     26#include "imlib/filesel.h"
     27#include "imlib/tools.h"
     28#include "imlib/pcxread.h"
     29
    2030#include "dev.h"
    21 #include "input.h"
    2231#include "objects.h"
    2332#include "id.h"
    24 #include "lisp.h"
    2533#include "light.h"
    2634#include "devsel.h"
    27 #include "dprint.h"
    2835#include "property.h"
    29 #include "pmenu.h"
    30 #include "filesel.h"
    31 #include "tools.h"
    3236#include "game.h"
    33 #include "pcxread.h"
    34 #include "lisp_gc.h"
    3537#include "demo.h"
    3638#include "profile.h"
  • abuse/branches/lol/src/devsel.cpp

    r715 r724  
    1515#include "common.h"
    1616
     17#include "imlib/scroller.h"
     18
    1719#include "devsel.h"
    18 #include "scroller.h"
    1920#include "cache.h"
    2021#include "game.h"
  • abuse/branches/lol/src/devsel.h

    r716 r724  
    1212#define __DEVSCROLL_HPP_
    1313
    14 #include "scroller.h"
     14#include "imlib/scroller.h"
    1515
    1616class ATilePicker : public AScroller
  • abuse/branches/lol/src/director.cpp

    r706 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
     17#include "lisp/lisp.h"
     18
     19#include "imlib/fonts.h"
     20
    1721#include "director.h"
    1822#include "game.h"
    19 #include "lisp.h"
    20 #include "fonts.h"
    2123
    2224director scene_director;
  • abuse/branches/lol/src/endgame.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1717#include "common.h"
    1818
     19#include "lisp/lisp.h"
     20#include "lisp/lisp_gc.h"
     21
     22#include "imlib/pmenu.h"
     23#include "imlib/dprint.h"
     24
    1925#include "menu.h"
    20 #include "lisp.h"
    2126#include "game.h"
    2227#include "game.h"
    2328#include "id.h"
    24 #include "pmenu.h"
    2529#include "gui.h"
    2630#include "property.h"
    2731#include "dev.h"
    2832#include "clisp.h"
    29 #include "dprint.h"
    3033#include "director.h"
    31 #include "lisp_gc.h"
    3234
    3335extern Palette *old_pal;
  • abuse/branches/lol/src/extend.cpp

    r695 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
     17#include "lisp/lisp.h"
     18
    1719#include "extend.h"
    1820#include "view.h"
    1921#include "objects.h"
    20 #include "lisp.h"
    2122
    2223/*
  • abuse/branches/lol/src/game.cpp

    r719 r724  
    2525#include "loldebug.h"
    2626
     27#include "lisp/lisp.h"
     28#include "lisp/lisp_gc.h"
     29
     30#include "imlib/scroller.h"
     31#include "imlib/dprint.h"
     32#include "imlib/video.h"
     33#include "imlib/guistat.h"
     34#include "imlib/pmenu.h"
     35
    2736#include "sdlport/joy.h"
    2837
    2938#include "dev.h"
    3039#include "game.h"
    31 
    3240#include "id.h"
    3341#include "automap.h"
     
    3543#include "ability.h"
    3644#include "cache.h"
    37 #include "lisp.h"
    3845#include "configuration.h"
    3946#include "light.h"
    40 #include "scroller.h"
    41 #include "dprint.h"
    4247#include "nfserver.h"
    43 #include "video.h"
    4448#include "transp.h"
    4549#include "clisp.h"
    46 #include "guistat.h"
    4750#include "menu.h"
    4851#include "gamma.h"
    49 #include "lisp_gc.h"
    5052#include "demo.h"
    5153#include "statbar.h"
    5254#include "profile.h"
    5355#include "compiled.h"
    54 #include "lisp_gc.h"
    55 #include "pmenu.h"
    5656#include "chat.h"
    5757#include "demo.h"
  • abuse/branches/lol/src/game.h

    r715 r724  
    1212#define __GAME_HPP_
    1313
     14#include "imlib/image.h"
     15#include "imlib/video.h"
     16#include "imlib/event.h"
     17#include "imlib/fonts.h"
     18#include "imlib/window.h"
     19#include "imlib/filter.h"
     20
    1421#include "loader2.h"
    15 
    16 #include "image.h"
    17 #include "video.h"
    18 #include "event.h"
    19 #include "fonts.h"
    2022#include "items.h"
    21 #include "window.h"
    22 #include "filter.h"
    2323#include "level.h"
    2424#include "cache.h"
  • abuse/branches/lol/src/gamma.cpp

    r715 r724  
    1717#include "common.h"
    1818
     19#include "lisp/lisp.h"
     20
     21#include "imlib/window.h"
     22#include "imlib/scroller.h"
     23#include "imlib/dprint.h"
     24
    1925#include "game.h"
    20 
    21 #include "window.h"
    22 #include "lisp.h"
    23 #include "scroller.h"
    2426#include "id.h"
    2527#include "cache.h"
    26 #include "dprint.h"
    2728#include "loader2.h"
    2829
  • abuse/branches/lol/src/gamma.h

    r694 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __GAMMA_HPP_
    1313
    14 #include "palette.h"
     14#include "imlib/palette.h"
     15
    1516void gamma_correct(Palette *&pal, int force_menu = 0);
    1617
  • abuse/branches/lol/src/gui.h

    r716 r724  
    1212#define __GUI_HPP_
    1313
    14 #include "window.h"
     14#include "imlib/window.h"
    1515
    1616class AIconButton : public AWidget
  • abuse/branches/lol/src/help.h

    r643 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __HELP_HPP_
    1313
    14 #include "event.h"
     14#include "imlib/event.h"
    1515
    1616extern int total_help_screens;
  • abuse/branches/lol/src/imlib/event.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 2001 Anthony Kruize <trandor@labyrinth.net.au>
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This program is free software; you can redistribute it and/or modify
     
    2525#include "common.h"
    2626
    27 #include "event.h"
    28 #include "video.h"
    29 #include "filter.h"
     27#include "imlib/event.h"
     28#include "imlib/video.h"
     29#include "imlib/filter.h"
    3030
    3131//
  • abuse/branches/lol/src/imlib/event.h

    r715 r724  
    2727#define MIDDLE_BUTTON  4
    2828
    29 #include "keys.h"
     29#include "imlib/keys.h"
     30
    3031#include "sprite.h"
    3132
  • abuse/branches/lol/src/imlib/filesel.cpp

    r719 r724  
    1313#endif
    1414
    15 #include <unistd.h>
     15#if defined HAVE_UNISTD_H
     16#   include <unistd.h>
     17#endif
    1618
    1719#include "common.h"
    1820
    19 #include "filesel.h"
    20 #include "input.h"
    21 #include "scroller.h"
     21#include "imlib/filesel.h"
     22#include "imlib/input.h"
     23#include "imlib/scroller.h"
     24
    2225#include "jdir.h"
    2326
  • abuse/branches/lol/src/imlib/filesel.h

    r715 r724  
    1212#define __FSELECT_HPP_
    1313
    14 #include "window.h"
     14#include "imlib/window.h"
    1515
    1616AWindow *file_dialog(char const *prompt, char const *def,
    17              int ok_id, char const *ok_name, int cancel_id,
     17                     int ok_id, char const *ok_name, int cancel_id,
    1818                     char const *cancel_name, char const *FILENAME_str,
    19              int filename_id);
     19                     int filename_id);
    2020
    2121#endif
  • abuse/branches/lol/src/imlib/filter.cpp

    r719 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
    17 #include "image.h"
    18 #include "filter.h"
     17#include "imlib/image.h"
     18#include "imlib/filter.h"
    1919
    2020Filter::Filter(int colors)
  • abuse/branches/lol/src/imlib/filter.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define _FILTER_HPP
    1313
    14 #include "image.h"
    15 #include "palette.h"
    16 #include "specs.h"
     14#include "imlib/image.h"
     15#include "imlib/palette.h"
     16#include "imlib/specs.h"
    1717
    1818class Filter
  • abuse/branches/lol/src/imlib/fonts.cpp

    r719 r724  
    1717#include "common.h"
    1818
    19 #include "fonts.h"
     19#include "imlib/fonts.h"
    2020
    2121void JCFont::PutString(AImage *screen, ivec2 pos, String const &st, int color)
  • abuse/branches/lol/src/imlib/fonts.h

    r715 r724  
    1212#define __FONTS_HPP_
    1313
    14 #include "image.h"
    15 #include "transimage.h"
     14#include "imlib/image.h"
     15#include "imlib/transimage.h"
    1616
    1717class JCFont
  • abuse/branches/lol/src/imlib/guistat.cpp

    r715 r724  
    1717#include "common.h"
    1818
    19 #include "input.h"
    20 #include "status.h"
    21 #include "guistat.h"
     19#include "imlib/input.h"
     20#include "imlib/status.h"
     21#include "imlib/guistat.h"
    2222
    2323class gui_status_node
  • abuse/branches/lol/src/imlib/guistat.h

    r715 r724  
    1414#include <string.h>
    1515
    16 #include "status.h"
    17 #include "window.h"
     16#include "imlib/status.h"
     17#include "imlib/window.h"
    1818
    1919class gui_status_node;
  • abuse/branches/lol/src/imlib/image.cpp

    r719 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1818#include "common.h"
    1919
    20 #include "image.h"
     20#include "imlib/image.h"
    2121
    2222Array<AImage *> image_list; // FIXME: only jwindow.cpp needs this
  • abuse/branches/lol/src/imlib/image.h

    r711 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1313
    1414#include <stdlib.h>
    15 #include "palette.h"
    16 #include "specs.h"
     15
     16#include "imlib/palette.h"
     17#include "imlib/specs.h"
     18
    1719#define MAX_DIRTY 200
    1820
  • abuse/branches/lol/src/imlib/include.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1111#ifndef __INCLUDE_HPP_
    1212#define __INCLUDE_HPP_
    13 #include "image.h"
    14 #include "palette.h"
     13
     14#include "imlib/image.h"
     15#include "imlib/palette.h"
    1516
    1617void write_include(AImage *im, Palette *pal, char *filename, char *name);
  • abuse/branches/lol/src/imlib/input.cpp

    r717 r724  
    1717#include "common.h"
    1818
    19 #include "input.h"
     19#include "imlib/input.h"
    2020
    2121void AButton::remap(Filter *f)
  • abuse/branches/lol/src/imlib/input.h

    r717 r724  
    1212#define __INPUT_HPP_
    1313
    14 #include "window.h"
    15 #include "filter.h"
     14#include "imlib/window.h"
     15#include "imlib/filter.h"
    1616
    1717extern WindowManager *wm; /* FIXME: get rid of this if possible */
  • abuse/branches/lol/src/imlib/keys.cpp

    r555 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1616#include <ctype.h>
    1717
    18 #include "keys.h"
     18#include "imlib/keys.h"
    1919
    2020char const *jk_key_names[]=
  • abuse/branches/lol/src/imlib/palette.cpp

    r719 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1717#include "common.h"
    1818
    19 #include "palette.h"
    20 #include "image.h"
    21 #include "video.h"
    22 #include "filter.h"
     19#include "imlib/palette.h"
     20#include "imlib/image.h"
     21#include "imlib/video.h"
     22#include "imlib/filter.h"
    2323
    2424Palette *lastl = NULL;
  • abuse/branches/lol/src/imlib/palette.h

    r711 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define _PALETTE_H_
    1313
    14 #include "specs.h"
     14#include "imlib/specs.h"
    1515
    1616class Palette
  • abuse/branches/lol/src/imlib/pcxread.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
    17 #include "pcxread.h"
    18 #include "specs.h"
     17#include "imlib/pcxread.h"
     18#include "imlib/specs.h"
    1919
    2020enum PCX_type { not_PCX, PCX_8, PCX_24 };
  • abuse/branches/lol/src/imlib/pcxread.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __PCX_READ_HPP__
    1313
    14 #include "image.h"
    15 #include "palette.h"
     14#include "imlib/image.h"
     15#include "imlib/palette.h"
    1616
    1717void write_PCX(AImage *im, Palette *pal, char const *filename);
  • abuse/branches/lol/src/imlib/pmenu.cpp

    r715 r724  
    1717#include "common.h"
    1818
    19 #include "pmenu.h"
     19#include "imlib/pmenu.h"
    2020
    2121void pmenu::move(int new_x, int new_y)
  • abuse/branches/lol/src/imlib/pmenu.h

    r715 r724  
    1212#define __PMENU_HPP_
    1313
    14 #include "input.h"
     14#include "imlib/input.h"
    1515
    1616class psub_menu;
  • abuse/branches/lol/src/imlib/scroller.cpp

    r716 r724  
    1515#include "common.h"
    1616
    17 #include "scroller.h"
     17#include "imlib/scroller.h"
     18
    1819#define HS_ICON_W 10
    1920#define HS_ICON_H 8
    20 
    2121
    2222uint8_t const hs_left_arrow[10*8]={
  • abuse/branches/lol/src/imlib/scroller.h

    r716 r724  
    1212#define _SCROLLER_HPP_
    1313
    14 #include "input.h"
     14#include "imlib/input.h"
    1515
    1616class AScroller : public AWidget
  • abuse/branches/lol/src/imlib/specs.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1919#include <fcntl.h>
    2020#include <math.h>
    21 #include <unistd.h>
     21
     22#if defined HAVE_UNISTD_H
     23#   include <unistd.h>
     24#endif
     25
    2226#include <sys/types.h>
    2327#include <sys/stat.h>
     
    2529#include "common.h"
    2630
    27 #include "image.h"
    28 #include "palette.h"
    29 #include "specs.h"
    30 #include "dprint.h"
     31#include "imlib/image.h"
     32#include "imlib/palette.h"
     33#include "imlib/specs.h"
     34#include "imlib/dprint.h"
    3135
    3236char const *spec_types[] =
  • abuse/branches/lol/src/imlib/sprite.cpp

    r719 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1717#include "common.h"
    1818
    19 #include "video.h"
    20 #include "image.h"
    21 #include "palette.h"
     19#include "imlib/video.h"
     20#include "imlib/image.h"
     21#include "imlib/palette.h"
     22
    2223#include "sprite.h"
    2324
  • abuse/branches/lol/src/imlib/sprite.h

    r711 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __SPRITE_HPP
    1313
    14 #include "image.h"
     14#include "imlib/image.h"
    1515
    1616class ASprite
  • abuse/branches/lol/src/imlib/status.cpp

    r715 r724  
    1717#include "common.h"
    1818
    19 #include "status.h"
    20 #include "dprint.h"
     19#include "imlib/status.h"
     20#include "imlib/dprint.h"
    2121
    2222status_manager *stat_man=NULL;
  • abuse/branches/lol/src/imlib/supmorph.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
    17 #include "supmorph.h"
    18 #include "specs.h"
    19 #include "transimage.h"
    20 #include "filter.h"
    21 #include "video.h"
     17#include "imlib/supmorph.h"
     18#include "imlib/specs.h"
     19#include "imlib/transimage.h"
     20#include "imlib/filter.h"
     21#include "imlib/video.h"
    2222
    2323#define p_swap(x,y) { x^=y; y^=x; x^=y; }
  • abuse/branches/lol/src/imlib/supmorph.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __SUPER_MORPH_HPP__
    1313
    14 #include "transimage.h"
     14#include "imlib/transimage.h"
    1515
    1616class super_morph
  • abuse/branches/lol/src/imlib/tools.cpp

    r715 r724  
    1515#include "common.h"
    1616
    17 #include "tools.h"
     17#include "imlib/tools.h"
    1818
    1919AToolPicker::AToolPicker(ivec2 pos, int id,
  • abuse/branches/lol/src/imlib/tools.h

    r715 r724  
    1212#define __TOOLS_HPP_
    1313
    14 #include "window.h"
    15 #include "input.h"
    16 #include "specs.h"
    17 #include "scroller.h"
     14#include "imlib/window.h"
     15#include "imlib/input.h"
     16#include "imlib/specs.h"
     17#include "imlib/scroller.h"
     18
    1819#include "visobj.h"
    1920
     
    5051#endif
    5152
    52 
    53 
    54 
    55 
    56 
    57 
  • abuse/branches/lol/src/imlib/transimage.cpp

    r719 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1818#include "common.h"
    1919
    20 #include "transimage.h"
     20#include "imlib/transimage.h"
    2121
    2222TransImage::TransImage(AImage *im, char const *name)
  • abuse/branches/lol/src/imlib/transimage.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __TIMAGE_HPP__
    1313
    14 #include "image.h"
    15 #include "palette.h"
    16 #include "filter.h"
     14#include "imlib/image.h"
     15#include "imlib/palette.h"
     16#include "imlib/filter.h"
    1717
    1818/*  Data is stored in the following format:
  • abuse/branches/lol/src/imlib/video.cpp

    r710 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1717#include "common.h"
    1818
    19 #include "image.h"
    20 #include "video.h"
     19#include "imlib/image.h"
     20#include "imlib/video.h"
    2121
    2222void update_dirty(AImage *im, int xoff, int yoff)
  • abuse/branches/lol/src/imlib/video.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define _VIDEO_HPP_
    1313
     14#include "imlib/image.h"
     15
    1416#define TRI_1024x768x256 0x62
    1517#define TRI_800x600x256  0x5e
     
    1921#define XWINDOWS_256     256
    2022#define XWINDOWS_2       2
    21 
    22 #include "image.h"
    2323
    2424class AbuseVideo
  • abuse/branches/lol/src/imlib/visobj.h

    r715 r724  
    1212#define VIS_OBJECT_HPP
    1313
    14 #include "window.h"
    15 #include "filter.h"
     14#include "imlib/window.h"
     15#include "imlib/filter.h"
    1616
    1717class AVisualObject
  • abuse/branches/lol/src/imlib/window.cpp

    r719 r724  
    1717#include "common.h"
    1818
    19 #include "video.h"
    20 #include "image.h"
    21 #include "input.h"
    22 #include "event.h"
    23 #include "filter.h"
    24 #include "window.h"
     19#include "imlib/video.h"
     20#include "imlib/image.h"
     21#include "imlib/input.h"
     22#include "imlib/event.h"
     23#include "imlib/filter.h"
     24#include "imlib/window.h"
    2525
    2626static int jw_left = 3, jw_right = 3, jw_top = 2, jw_bottom = 3;
  • abuse/branches/lol/src/imlib/window.h

    r716 r724  
    1414#include <stdarg.h>
    1515
    16 #include "video.h"
    17 #include "image.h"
    18 #include "event.h"
    19 #include "filter.h"
    20 #include "fonts.h"
     16#include "imlib/video.h"
     17#include "imlib/image.h"
     18#include "imlib/event.h"
     19#include "imlib/filter.h"
     20#include "imlib/fonts.h"
    2121
    2222class WindowManager;
  • abuse/branches/lol/src/innet.cpp

    r715 r724  
    1717#include "common.h"
    1818
    19 #include "demo.h"
    20 #include "specs.h"
    21 #include "level.h"
    22 #include "game.h"
    23 #include "dev.h"
    24 #include "netface.h"
    25 
    26 #if HAVE_NETWORK
    27 #   include "fileman.h"
    28 #endif
     19#include "imlib/specs.h"
     20#include "imlib/dprint.h"
     21
    2922#include "net/sock.h"
    3023#include "net/ghandler.h"
    3124#include "net/gserver.h"
    3225#include "net/gclient.h"
    33 #include "dprint.h"
     26
     27#include "demo.h"
     28#include "level.h"
     29#include "game.h"
     30#include "dev.h"
     31#if HAVE_NETWORK
     32#   include "fileman.h"
     33#endif
     34#include "netface.h"
    3435#include "netcfg.h"
    3536
  • abuse/branches/lol/src/items.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
     17#include "lisp/lisp.h"
     18
    1719#include "items.h"
    18 #include "lisp.h"
    1920#include "dev.h"
    20 
    2121
    2222extern Palette *g_palette;
  • abuse/branches/lol/src/items.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1111#ifndef __ITEMS_HPP__
    1212#define __ITEMS_HPP__
    13 #include "image.h"
    14 #include "transimage.h"
    15 #include "specs.h"
    16 #include "points.h"
     13
    1714#include <stdio.h>
    1815#include <stdlib.h>
     16
     17#include "imlib/image.h"
     18#include "imlib/transimage.h"
     19#include "imlib/specs.h"
     20
     21#include "points.h"
    1922
    2023#define AUTOTILE_WIDTH 6
  • abuse/branches/lol/src/lcache.cpp

    r686 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    2121#include "common.h"
    2222
    23 #include "lisp.h"
    24 #include "specs.h"
     23#include "lisp/lisp.h"
     24
     25#include "imlib/specs.h"
    2526
    2627size_t block_size(LObject *level)  // return size needed to recreate this block
  • abuse/branches/lol/src/lcache.h

    r555 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1111#ifndef __LCACHE_HPP_
    1212#define __LCACHE_HPP_
    13 #include "lisp.h"
     13
     14#include "lisp/lisp.h"
    1415
    1516// return number of bytes to save this block of code
  • abuse/branches/lol/src/level.cpp

    r716 r724  
    2424#include "common.h"
    2525
     26#include "lisp/lisp.h"
     27#include "lisp/lisp_gc.h"
     28
     29#include "imlib/dprint.h"
     30#include "imlib/status.h"
     31#include "imlib/pcxread.h"
     32
    2633#include "light.h"
    2734#include "level.h"
    2835#include "game.h"
    2936#include "intsect.h"
    30 #include "lisp.h"
    31 #include "dprint.h"
    3237#include "particle.h"
    3338#include "objects.h"
    3439#include "clisp.h"
    35 #include "status.h"
    3640#include "dev.h"
    3741#include "demo.h"
    38 #include "pcxread.h"
    3942#include "profile.h"
    4043#include "statbar.h"
    4144#include "cop.h"
    4245#include "nfserver.h"
    43 #include "lisp_gc.h"
    4446
    4547Level *g_current_level;
  • abuse/branches/lol/src/level.h

    r712 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1313#define __LEVEL_HPP_
    1414
    15 #include "specs.h"
     15#include "imlib/specs.h"
     16
    1617#include "objects.h"
    1718#include "view.h"
  • abuse/branches/lol/src/light.cpp

    r719 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1717#include "common.h"
    1818
     19#include "imlib/image.h"
     20#include "imlib/video.h"
     21#include "imlib/palette.h"
     22#include "imlib/specs.h"
     23#include "imlib/dprint.h"
     24#include "imlib/filter.h"
     25#include "imlib/status.h"
     26
    1927#include "light.h"
    20 #include "image.h"
    21 #include "video.h"
    22 #include "palette.h"
    23 #include "specs.h"
    24 #include "dprint.h"
    25 #include "filter.h"
    26 #include "status.h"
    2728#include "dev.h"
    2829
  • abuse/branches/lol/src/light.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define LIGHT_HPP
    1313
    14 #include "image.h"
    15 #include "palette.h"
     14#include "imlib/image.h"
     15#include "imlib/palette.h"
     16
    1617#include "configuration.h"
    1718#include "crc.h"
  • abuse/branches/lol/src/lisp/lisp.cpp

    r713 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    2323#define TYPE_CHECKING 1
    2424
    25 #include "lisp.h"
    26 #include "lisp_gc.h"
     25#include "lisp/lisp.h"
     26#include "lisp/lisp_gc.h"
     27
    2728#include "symbols.h"
    28 
    2929#ifdef NO_LIBS
    3030#   include "fakelib.h"
    3131#else
    32 #   include "status.h"
    33 #   include "specs.h"
    34 #   include "dprint.h"
     32#   include "imlib/status.h"
     33#   include "imlib/specs.h"
     34#   include "imlib/dprint.h"
    3535#   include "cache.h"
    3636#   include "dev.h"
  • abuse/branches/lol/src/lisp/lisp_gc.cpp

    r687 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1818#include "common.h"
    1919
    20 #include "lisp.h"
    21 #include "lisp_gc.h"
     20#include "lisp/lisp.h"
     21#include "lisp/lisp_gc.h"
    2222
    2323#include "stack.h"
  • abuse/branches/lol/src/lisp/lisp_opt.cpp

    r636 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1414
    1515#ifdef NO_LIBS
    16 #include "fakelib.h"
     16#   include "fakelib.h"
    1717#endif
    1818
    19 #include "lisp.h"
    20 #include "lisp_gc.h"
     19#include "lisp/lisp.h"
     20#include "lisp/lisp_gc.h"
    2121
    2222LObject *l_undefined;
  • abuse/branches/lol/src/lisp/lisp_opt.h

    r555 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __LISP_OPT_HPP_
    1313
    14 #include "lisp.h"
     14#include "lisp/lisp.h"
    1515
    1616extern LObject *l_undefined;
  • abuse/branches/lol/src/loader2.cpp

    r716 r724  
    1717#include "common.h"
    1818
     19#include "imlib/specs.h"
     20#include "lisp/lisp.h"
     21#include "imlib/dprint.h"
     22
    1923#include "loader2.h"
    2024#include "chars.h"
    21 #include "specs.h"
    22 #include "lisp.h"
    2325#include "menu.h"
    2426#include "dev.h"
    2527#include "director.h"
    26 
    2728#include "dev.h"
    2829#include "light.h"
    29 #include "dprint.h"
    3030#include "particle.h"
    3131#include "clisp.h"
  • abuse/branches/lol/src/loader2.h

    r715 r724  
    1313
    1414#include "lisp/lisp.h"
     15
     16#include "imlib/window.h"
     17
    1518#include "sdlport/sound.h"
    16 
    17 #include "window.h"
    1819
    1920extern class APropertyManager *g_prop;
  • abuse/branches/lol/src/loadgame.cpp

    r719 r724  
    1717#include "common.h"
    1818
     19#include "lisp/lisp.h"
     20
     21#include "imlib/specs.h"
     22#include "imlib/window.h"
     23#include "imlib/input.h"
     24#include "imlib/fonts.h"
     25#include "imlib/dprint.h"
     26
    1927#include "game.h"
    20 
    21 #include "specs.h"
    22 #include "window.h"
    2328#include "id.h"
    24 #include "input.h"
    25 #include "fonts.h"
    26 #include "lisp.h"
    27 #include "dprint.h"
    2829#include "cache.h"
    2930#include "gui.h"
  • abuse/branches/lol/src/menu.cpp

    r719 r724  
    1717#include "common.h"
    1818
     19#include "lisp/lisp.h"
     20
     21#include "imlib/pmenu.h"
     22#include "imlib/dprint.h"
     23#include "imlib/scroller.h"
     24
     25#include "net/sock.h"
     26
     27#include "ui/volumewindow.h"
     28
    1929#include "dev.h"
    20 
    21 #include "ui/volumewindow.h"
    22 
    2330#include "menu.h"
    24 #include "lisp.h"
    2531#include "game.h"
    2632#include "game.h"
    2733#include "id.h"
    28 #include "pmenu.h"
    2934#include "gui.h"
    3035#include "property.h"
    3136#include "clisp.h"
    3237#include "gamma.h"
    33 #include "dprint.h"
    3438#include "demo.h"
    3539#include "loadgame.h"
    36 #include "scroller.h"
    3740#include "netcfg.h"
    38 
    39 #include "net/sock.h"
    4041
    4142extern net_protocol *prot;
  • abuse/branches/lol/src/menu.h

    r555 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1111#ifndef GRUE_MENU_HPP
    1212#define GRUE_MENU_HPP
    13 #include "fonts.h"
     13
     14#include "imlib/fonts.h"
    1415
    1516int menu(void *args, JCFont *font);             // reurns -1 on esc
  • abuse/branches/lol/src/morpher.h

    r691 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1111#ifndef __MORPHER_HPP_
    1212#define __MORPHER_HPP_
    13 #include "supmorph.h"
     13
     14#include "imlib/supmorph.h"
     15
    1416#include "configuration.h"
    1517
  • abuse/branches/lol/src/net/gserver.cpp

    r715 r724  
    1616#include <stdlib.h>
    1717#include <fcntl.h>
    18 #include <unistd.h>
     18#if defined HAVE_UNISTD_H
     19#   include <unistd.h>
     20#endif
    1921#include <sys/stat.h>
    2022#include <sys/types.h>
     
    2224
    2325#include "common.h"
     26
     27#include "imlib/window.h"
     28#include "imlib/input.h"
    2429
    2530#include "gserver.h"
     
    2732#include "netcfg.h"
    2833#include "id.h"
    29 #include "window.h"
    30 #include "input.h"
    3134#include "dev.h"
    3235#include "game.h"
  • abuse/branches/lol/src/netcfg.cpp

    r716 r724  
    1515#include "common.h"
    1616
     17#include "imlib/input.h"
     18
     19#include "net/sock.h"
     20
    1721#include "game.h"
    18 
    1922#include "netcfg.h"
    20 #include "input.h"
    2123#include "cache.h"
    2224#include "light.h"
    23 
    2425#include "dev.h"
    25 
    26 #include "net/sock.h"
    2726
    2827extern char *get_login();
  • abuse/branches/lol/src/netcfg.h

    r715 r724  
    1212#define __NETCFG_HPP_
    1313
    14 #include "window.h"
     14#include "imlib/window.h"
    1515
    1616class net_configuration
  • abuse/branches/lol/src/nfclient.cpp

    r713 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1717#endif
    1818#include <fcntl.h>
    19 #include <unistd.h>
     19#if defined HAVE_UNISTD_H
     20#   include <unistd.h>
     21#endif
    2022#include <ctype.h>
    2123
    2224#include "common.h"
    2325
     26#include "imlib/specs.h"
     27#include "imlib/dprint.h"
     28
     29#include "net/gserver.h"
     30
    2431#include "netface.h"
    25 
    26 #include "specs.h"
    2732#include "nfserver.h"
    28 #include "dprint.h"
    2933#include "crc.h"
    3034#include "cache.h"
    31 
    32 #include "net/gserver.h"
    3335
    3436void remove_client(int client_number) { ; }
  • abuse/branches/lol/src/nfserver.h

    r651 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __NFSERVER_HPP_
    1313
    14 #include "specs.h"
     14#include "imlib/specs.h"
     15
     16#include "net/sock.h"
     17
    1518#include "netface.h"
    16 #include "net/sock.h"
    1719
    1820int net_init(int argc, char **argv);
  • abuse/branches/lol/src/objects.cpp

    r706 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
    17 #include "transimage.h"
     17#include "lisp/lisp.h"
     18#include "lisp/lisp_gc.h"
     19
     20#include "imlib/transimage.h"
     21#include "imlib/dprint.h"
     22
    1823#include "objects.h"
    1924#include "chars.h"
    20 
    2125#include "game.h"
    2226#include "intsect.h"
    2327#include "ability.h"
    24 #include "lisp.h"
    2528#include "light.h"
    26 #include "dprint.h"
    2729#include "clisp.h"
    28 #include "lisp_gc.h"
    2930#include "profile.h"
    3031
  • abuse/branches/lol/src/objects.h

    r715 r724  
    1111#ifndef _OBJECTS_HPP_
    1212#define _OBJECTS_HPP_
    13 #include "input.h"
     13
     14#include "imlib/input.h"
     15
    1416#include "chars.h"
    1517//#include "sound.h"
  • abuse/branches/lol/src/old.nfclient.cpp

    r690 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include <sys/types.h>
    1616#include <fcntl.h>
    17 #include <unistd.h>
    18 
    19 #include "specs.h"
     17#if defined HAVE_UNISTD_H
     18#   include <unistd.h>
     19#endif
     20
     21#include "imlib/specs.h"
     22#include "imlib/dprint.h"
     23
    2024#include "nfserver.h"
    21 #include "dprint.h"
    2225#include "crc.h"
    2326#include "cache.h"
  • abuse/branches/lol/src/old.nfserver.cpp

    r706 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1313#endif
    1414
     15#include "imlib/specs.h"
     16#include "imlib/dprint.h"
     17
    1518#include "jnet.h"
    16 #include "specs.h"
    1719#include "nfserver.h"
    18 #include "dprint.h"
    1920#include "cache.h"
    2021#include "crc.h"
  • abuse/branches/lol/src/old_server.cpp

    r706 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1313#endif
    1414
    15 #include <unistd.h>
     15#if defined HAVE_UNISTD_H
     16#   include <unistd.h>
     17#endif
     18
     19#include "imlib/dprint.h"
    1620
    1721#include "nfserver.h"
    18 
    1922#include "server.h"
    2023#include "view.h"
    21 #include "dprint.h"
    2224#include "jnet.h"
    2325#include "level.h"
    2426#include "game.h"
    25 //#include "nfserver.h"
    26 //#include "nfclient.h"
    2727
    2828//nfs_server *file_server=NULL;
  • abuse/branches/lol/src/particle.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
     17#include "lisp/lisp.h"
     18
    1719#include "particle.h"
    1820#include "view.h"
    19 #include "lisp.h"
    2021#include "cache.h"
    21 
    2222
    2323static int total_pseqs=0;
  • abuse/branches/lol/src/particle.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __PARTICLE_HPP_
    1313
    14 #include "specs.h"
    15 #include "image.h"
     14#include "imlib/specs.h"
     15#include "imlib/image.h"
    1616
    1717class view;
  • abuse/branches/lol/src/points.h

    r555 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include <stdlib.h>
    1616
    17 #include "specs.h"
     17#include "imlib/specs.h"
    1818
    1919class point_list
  • abuse/branches/lol/src/profile.cpp

    r715 r724  
    1515#include "common.h"
    1616
     17#include "imlib/window.h"
     18
    1719#include "game.h"
    18 
    1920#include "profile.h"
    20 #include "window.h"
    2121#include "property.h"
    2222#include "objects.h"
  • abuse/branches/lol/src/profile.h

    r643 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1212#define __JPROF_HPP_
    1313
    14 #include "event.h"
     14#include "imlib/event.h"
    1515
    1616void profile_init();
     
    2323int profiling();
    2424
     25#endif
    2526
    26 #endif
  • abuse/branches/lol/src/property.cpp

    r714 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1818#include "common.h"
    1919
     20#include "imlib/dprint.h"
     21
    2022#include "property.h"
    21 #include "dprint.h"
    2223#include "game.h"
    2324
  • abuse/branches/lol/src/sdlport/event.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 2001 Anthony Kruize <trandor@labyrinth.net.au>
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This program is free software; you can redistribute it and/or modify
     
    2727#include "common.h"
    2828
    29 #include "image.h"
    30 #include "palette.h"
    31 #include "video.h"
    32 #include "event.h"
     29#include "imlib/image.h"
     30#include "imlib/palette.h"
     31#include "imlib/video.h"
     32#include "imlib/event.h"
     33
    3334#include "sprite.h"
    3435#include "game.h"
  • abuse/branches/lol/src/sdlport/setup.cpp

    r703 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 2001 Anthony Kruize <trandor@labyrinth.net.au>
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This program is free software; you can redistribute it and/or modify
     
    2727#include <sys/stat.h>
    2828#include <signal.h>
     29
    2930#include <SDL.h>
    30 #ifdef __APPLE__
    31 #   include <Carbon/Carbon.h>
    32 #   include <OpenGL/gl.h>
    33 #   include <OpenGL/glu.h>
    34 #else
    35 #   include <GL/gl.h>
    36 #   include <GL/glu.h>
    37 #endif    /* __APPLE__ */
    3831
    3932#include "common.h"
    4033
    41 #include "specs.h"
    42 #include "keys.h"
     34#include "imlib/specs.h"
     35#include "imlib/keys.h"
     36
    4337#include "setup.h"
    4438
     
    6761    printf( "  -datadir <arg>    Set the location of the game data to <arg>\n" );
    6862    printf( "  -fullscreen       Enable fullscreen mode\n" );
    69     printf( "  -antialias        Enable anti-aliasing\n" );
    7063    printf( "  -h, --help        Display this text\n" );
    7164    printf( "  -mono             Disable stereo sound\n" );
     
    9487        fputs( "; Use mono audio only\nmono=0\n\n", fd );
    9588        fputs( "; Grab the mouse to the window\ngrabmouse=0\n\n", fd );
    96         fputs( "; Use anti-aliasing\nantialias=1\n\n", fd );
    9789        fputs( "; Disable the SDL parachute in the case of a crash\nnosdlparachute=0\n\n", fd );
    9890        fputs( "; Key mappings\n", fd );
     
    139131                flags.grabmouse = atoi( result );
    140132            }
    141             else if( strcasecmp( result, "antialias" ) == 0 )
    142             {
    143                 result = strtok( NULL, "\n" );
    144                 if( atoi( result ) )
    145                 {
    146                     flags.antialias = GL_LINEAR;
    147                 }
    148             }
    149133            else if( strcasecmp( result, "nosdlparachute" ) == 0 )
    150134            {
     
    233217        {
    234218            flags.nosound = 1;
    235         }
    236         else if( !strcasecmp( argv[ii], "-antialias" ) )
    237         {
    238             flags.antialias = GL_LINEAR;
    239219        }
    240220        else if( !strcasecmp( argv[ii], "-mono" ) )
     
    271251    flags.xres = xres        = 320;            // Default window width
    272252    flags.yres = yres        = 200;            // Default window height
    273     flags.antialias            = GL_NEAREST;    // Don't anti-alias
    274253    keys.up                    = key_value( "UP" );
    275254    keys.down                = key_value( "DOWN" );
  • abuse/branches/lol/src/sdlport/setup.h

    r702 r724  
    2222    short yres;
    2323    short overlay;
    24     int antialias;
    2524};
    2625
  • abuse/branches/lol/src/sdlport/sound.cpp

    r722 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 2001 Anthony Kruize <trandor@labyrinth.net.au>
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This program is free software; you can redistribute it and/or modify
     
    2525#include <cstring>
    2626
    27 #include "common.h"
    28 
    2927#include <SDL.h>
    3028#include <SDL/SDL_mixer.h>
    3129
     30#include "common.h"
     31
     32#include "imlib/specs.h"
     33
    3234#include "sound.h"
    3335#include "hmi.h"
    34 #include "specs.h"
    3536#include "setup.h"
    3637
  • abuse/branches/lol/src/sdlport/video.cpp

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 2001 Anthony Kruize <trandor@labyrinth.net.au>
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This program is free software; you can redistribute it and/or modify
     
    2323#endif
    2424
    25 #include <SDL.h>
    26 
    27 #ifdef __APPLE__
    28 #   include <OpenGL/gl.h>
    29 #   include <OpenGL/glu.h>
    30 #else
    31 #   include <GL/gl.h>
    32 #   include <GL/glu.h>
    33 #endif    /* __APPLE__ */
    34 
    3525#include "common.h"
    3626
    37 #include "filter.h"
    38 #include "video.h"
    39 #include "image.h"
     27#include "imlib/filter.h"
     28#include "imlib/video.h"
     29#include "imlib/image.h"
     30
    4031#include "setup.h"
    4132
  • abuse/branches/lol/src/sensor.cpp

    r695 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
    17 #include "lisp.h"
    18 #include "lisp_gc.h"
     17#include "lisp/lisp.h"
     18#include "lisp/lisp_gc.h"
     19
    1920#include "compiled.h"
    2021#include "objects.h"
  • abuse/branches/lol/src/seq.cpp

    r555 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1515#include "common.h"
    1616
     17#include "lisp/lisp.h"
     18
    1719#include "seq.h"
    18 #include "lisp.h"
    1920
    2021size_t sequence::MemUsage()
  • abuse/branches/lol/src/server2.cpp

    r693 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1313#endif
    1414
     15#include "imlib/dprint.h"
     16
    1517#include "server2.h"
    1618#include "nfserver.h"
    1719#include "nfclient.h"
    18 #include "dprint.h"
    1920#include "view.h"
    2021#include "objects.h"
  • abuse/branches/lol/src/specache.h

    r689 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1414#include "common.h"
    1515
    16 #include "specs.h"
     16#include "imlib/specs.h"
    1717
    1818class SpecDirCache
  • abuse/branches/lol/src/statbar.cpp

    r716 r724  
    1515#include "common.h"
    1616
     17#include "lisp/lisp.h"
     18
    1719#include "statbar.h"
    1820#include "view.h"
    19 #include "lisp.h"
    2021#include "cache.h"
    2122#include "demo.h"
  • abuse/branches/lol/src/statbar.h

    r716 r724  
    1212#define __STAT_BAR_H_
    1313
     14#include "imlib/image.h"
    1415
    1516class view;
    1617
    1718#define TOTAL_WEAPONS 8
    18 #include "image.h"
    1919
    2020class status_bar
  • abuse/branches/lol/src/tool/abuse-tool.cpp

    r709 r724  
    22// Abuse Tool - package manager for Abuse format
    33//
    4 // Copyright: (c) 2011 Sam Hocevar <sam@hocevar.net>
     4// Copyright: (c) 2011-2013 Sam Hocevar <sam@hocevar.net>
    55//   This program is free software; you can redistribute it and/or
    66//   modify it under the terms of the Do What The Fuck You Want To
     
    1717
    1818#include "common.h"
    19 #include "specs.h"
    20 #include "image.h"
    21 #include "pcxread.h"
     19
     20#include "imlib/specs.h"
     21#include "imlib/image.h"
     22#include "imlib/pcxread.h"
     23
    2224#include "crc.h"
    2325
  • abuse/branches/lol/src/transp.h

    r709 r724  
    22 *  Abuse - dark 2D side-scrolling platform game
    33 *  Copyright (c) 1995 Crack dot Com
    4  *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     4 *  Copyright (c) 2005-2013 Sam Hocevar <sam@hocevar.net>
    55 *
    66 *  This software was released into the Public Domain. As with most public
     
    1111#ifndef __TRANSP_HPP_
    1212#define __TRANSP_HPP_
    13 #include "image.h"
     13
     14#include "imlib/image.h"
     15
    1416void transp_put(AImage *im, AImage *screen, uint8_t *table, int x, int y);
    1517
    1618#endif
     19
  • abuse/branches/lol/src/unixnfc.cpp

    r715 r724  
    2020#include <stdlib.h>
    2121#include <signal.h>
    22 #include <unistd.h>
     22#if defined HAVE_UNISTD_H
     23#   include <unistd.h>
     24#endif
    2325#include <sys/fcntl.h>
    2426#include <fcntl.h>
     27
     28#include "imlib/window.h"
    2529
    2630#include "netface.h"
     
    3135#include "server2.h"
    3236#include "game.h"
    33 #include "window.h"
    3437
    3538extern char lsf[256];
  • abuse/branches/lol/src/view.cpp

    r719 r724  
    1313#endif
    1414
    15 #include <unistd.h>
     15#if defined HAVE_UNISTD_H
     16#   include <unistd.h>
     17#endif
    1618
    1719#include "common.h"
    1820
     21#include "lisp/lisp.h"
     22
     23#include "imlib/window.h"
     24#include "imlib/scroller.h"
     25#include "imlib/dprint.h"
     26
    1927#include "game.h"
    20 
    2128#include "view.h"
    22 #include "lisp.h"
    23 #include "window.h"
    2429#include "configuration.h"
    25 #include "scroller.h"
    2630#include "id.h"
    2731#include "dev.h"
    28 #include "dprint.h"
    2932#include "transp.h"
    3033#include "clisp.h"
  • abuse/branches/lol/src/view.h

    r715 r724  
    1212#define _VIEW_HPP_
    1313
     14#include "imlib/window.h"
     15
    1416#include "light.h"
    15 #include "window.h"
    1617
    1718class object_node;
Note: See TracChangeset for help on using the changeset viewer.