Changeset 88


Ignore:
Timestamp:
Mar 6, 2008, 3:00:35 PM (10 years ago)
Author:
Sam Hocevar
Message:
  • Remove a few duplicate extern declarations. They belong to header files.
Location:
abuse/trunk/src
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/config.cpp

    r66 r88  
    1313
    1414#include "sdlport/joy.hpp"
     15#include "game.hpp"
    1516
    1617#include "keys.hpp"
     
    1819#include "jwindow.hpp"
    1920#include "config.hpp"
    20 #include "game.hpp"
    2121
    2222extern int get_key_binding(char const *dir, int i);
    2323
    24 extern window_manager *eh;
    2524int key_players = 0;
    2625int morph_detail = MEDIUM_DETAIL;
  • abuse/trunk/src/console.cpp

    r56 r88  
    1313#include <stdarg.h>
    1414
     15#include "game.hpp"
     16
    1517#include "linked.hpp"
    1618#include "console.hpp"
    1719#include "jmalloc.hpp"
    18 
    19 extern window_manager *eh;
    2020
    2121void console::put_string(char const *st)
  • abuse/trunk/src/demo.cpp

    r56 r88  
    1010#include "config.h"
    1111
     12#include "game.hpp"
     13
    1214#include "demo.hpp"
    1315#include "specs.hpp"
    1416#include "macs.hpp"
    1517#include "jwindow.hpp"
    16 #include "game.hpp"
    1718#include "jmalloc.hpp"
    1819#include "dprint.hpp"
     
    2526
    2627demo_manager demo_man;
    27 extern window_manager *eh;
    2828int last_demo_mx,last_demo_my,last_demo_mbut;
    2929extern base_memory_struct *base;   // points to shm_addr
  • abuse/trunk/src/dev.hpp

    r57 r88  
    1515#include "console.hpp"
    1616#include "timing.hpp"
     17
     18/* Cleaned-up externs */
     19extern int confirm_quit();
    1720
    1821
  • abuse/trunk/src/game.cpp

    r87 r88  
    2020#include "sdlport/joy.hpp"
    2121
     22#include "dev.hpp"
    2223#include "game.hpp"
    23 #include "dev.hpp"
     24
    2425#include "id.hpp"
    2526#include "timing.hpp"
     
    5758#define SHIFT_DOWN_DEFAULT 30
    5859
    59 class game;
    6060extern crc_manager *net_crcs;
    6161game *the_game;
     
    7777
    7878extern uint8_t chatting_enabled;
    79 
    80 extern int confirm_quit();
    8179
    8280// Enabled TCPIP driver
  • abuse/trunk/src/game.hpp

    r66 r88  
    4545#define BLACK 0
    4646
     47/* Cleaned-up externs */
     48extern window_manager *eh;
     49
     50
    4751#define tile_type unsigned short
    4852class game;
    4953extern game *the_game;
    50 extern window_manager *eh;
    5154extern int dev;
    5255extern int morph_sel_frame_color;
  • abuse/trunk/src/gamma.cpp

    r56 r88  
    1212#include <math.h>
    1313
     14#include "game.hpp"
     15
    1416#include "jwindow.hpp"
    1517#include "lisp.hpp"
    16 #include "game.hpp"
    1718#include "scroller.hpp"
    1819#include "id.hpp"
     
    2223#include "loader2.hpp"
    2324
    24 extern window_manager *eh;
    2525extern int dev_ok;
    2626palette *old_pal=NULL;
  • abuse/trunk/src/loadgame.cpp

    r56 r88  
    1111
    1212#include <string.h>
     13
     14#include "game.hpp"
    1315
    1416#include "specs.hpp"
     
    2426#include "id.hpp"
    2527#include "demo.hpp"
    26 #include "game.hpp"
    2728
    2829extern void *save_order;         // load from "saveordr.lsp", contains a list ordering the save games
    2930
    3031extern JCFont *console_font;
    31 
    32 extern window_manager *eh;
    3332
    3433#define MAX_SAVE_GAMES 5
  • abuse/trunk/src/menu.cpp

    r61 r88  
    1111
    1212#include <math.h>
     13
     14#include "dev.hpp"
    1315
    1416#include "menu.hpp"
     
    2123#include "gui.hpp"
    2224#include "property.hpp"
    23 #include "dev.hpp"
    2425#include "clisp.hpp"
    2526#include "gamma.hpp"
     
    3334extern net_protocol *prot;
    3435jwindow *volume_window=NULL;
    35 extern int confirm_quit();
    3636
    3737//percent is 0..256
  • abuse/trunk/src/netcfg.cpp

    r56 r88  
    1010#include "config.h"
    1111
     12#include "game.hpp"
     13
     14
    1215#include "netcfg.hpp"
    1316#include "input.hpp"
     
    2023
    2124extern char *get_login();
    22 extern window_manager *eh;
    2325net_configuration *main_net_cfg=NULL;
    2426extern char lsf[256];
  • abuse/trunk/src/profile.cpp

    r56 r88  
    1010#include "config.h"
    1111
     12#include "game.hpp"
     13
     14
    1215#include "profile.hpp"
    1316#include "jwindow.hpp"
    1417#include "property.hpp"
    1518#include "objects.hpp"
    16 
    17 extern window_manager *eh;
    1819
    1920
  • abuse/trunk/src/sdlport/event.cpp

    r56 r88  
    3333#include "game.hpp"
    3434
    35 extern int confirm_quit();
    3635extern int get_key_binding( char const *dir, int i );
    3736extern int mouse_xscale, mouse_yscale;
  • abuse/trunk/src/setup.cpp

    r56 r88  
    1111
    1212#ifdef __WATCOMC__
     13
     14#include "game.hpp"
    1315
    1416#include "specs.hpp"
     
    2931extern int sosEZGetConfig(char *szName);
    3032
    31 extern window_manager *eh;
    3233extern palette *lastl;
    3334
  • abuse/trunk/src/view.cpp

    r56 r88  
    99
    1010#include "config.h"
     11
     12#include "game.hpp"
     13
    1114
    1215#include "system.h"
     
    3134
    3235extern int get_key_binding( char const *dir, int i );
    33 extern window_manager *eh;
    3436view *player_list=NULL;
    3537int morph_sel_frame_color;
Note: See TracChangeset for help on using the changeset viewer.