From 52508222e496dcd34c5ebf33a91259766cb492c0 Mon Sep 17 00:00:00 2001 From: superfloh Date: Fri, 5 Dec 2008 17:41:27 +0000 Subject: [PATCH] remove BUFFS define --- Makefile.linux | 3 +-- Makefile.win | 3 +-- actors.c | 14 +++++--------- actors.h | 5 ----- buffs.c | 5 +---- buffs.h | 4 ---- multiplayer.c | 7 +------ new_actors.c | 7 +------ 8 files changed, 10 insertions(+), 38 deletions(-) diff --git a/Makefile.linux b/Makefile.linux index d91268807..00ec33d8a 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -21,7 +21,6 @@ ENCYCLOPEDIA_COBJ = books/fontdef.o books/parser.o books/symbol.o books/typesett MEMORY_DEBUG_COBJ = elmemory.o TEXT_ALIASES_COBJ = text_aliases.o SKY_FPV_COBJ = sky.o -BUFFS_COBJ = buffs.o USE_SHADER_COBJ = shader/noise.o shader/shader.o PAWN_COBJ = pawn/amx.o pawn/amxaux.o pawn/amxcons.o pawn/amxel.o \ pawn/amxfloat.o pawn/amxstring.o pawn/elpawn.o @@ -29,7 +28,7 @@ NEW_SELECTION_CXXOBJ = select.o CONTEXT_MENUS_CXXOBJ = context_menu.o COBJS=2d_objects.o 3d_objects.o \ actor_scripts.o actors.o alphamap.o asc.o astrology.o \ - bbox_tree.o books.o buddy.o bags.o \ + bbox_tree.o books.o buddy.o buffs.o bags.o \ cache.o cal.o calc.o chat.o cluster.o colors.o console.o consolewin.o \ counters.o cursors.o dialogues.o draw_scene.o eye_candy_debugwin.o \ elconfig.o elwindows.o encyclopedia.o errors.o events.o \ diff --git a/Makefile.win b/Makefile.win index 019958dac..96f47b3b3 100644 --- a/Makefile.win +++ b/Makefile.win @@ -23,7 +23,6 @@ STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a ENCYCLOPEDIA_COBJ = books/fontdef.o books/parser.o books/symbol.o books/typesetter.o sort.o symbol_table.o MEMORY_DEBUG_COBJ = elmemory.o TEXT_ALIASES_COBJ = text_aliases.o -BUFFS_COBJ = buffs.o SKY_FPV_COBJ = sky.o USE_SHADER_COBJ = shader/noise.o shader/shader.o PAWN_COBJ = pawn/amx.o pawn/amxaux.o pawn/amxcons.o pawn/amxel.o \ @@ -32,7 +31,7 @@ NEW_SELECTION_CXXOBJ = select.o CONTEXT_MENUS_CXXOBJ = context_menu.o COBJS=2d_objects.o 3d_objects.o \ actor_scripts.o actors.o alphamap.o asc.o astrology.o \ - bbox_tree.o books.o buddy.o bags.o \ + bbox_tree.o books.o buddy.o buffs.o bags.o \ cache.o cal.o calc.o chat.o cluster.o colors.o console.o consolewin.o \ counters.o cursors.o dialogues.o draw_scene.o eye_candy_debugwin.o \ elconfig.o elwindows.o encyclopedia.o errors.o events.o \ diff --git a/actors.c b/actors.c index d0b4375ee..94d127f44 100644 --- a/actors.c +++ b/actors.c @@ -6,9 +6,7 @@ #include "actor_scripts.h" #include "asc.h" #include "bbox_tree.h" -#ifdef BUFFS #include "buffs.h" -#endif // BUFFS #include "cal.h" #include "cursors.h" #include "draw_scene.h" @@ -177,12 +175,10 @@ int add_actor (int actor_type, char * skin_name, float x_pos, float y_pos, float our_actor->attachment_shift[0] = our_actor->attachment_shift[1] = our_actor->attachment_shift[2] = 0.0; #endif // ATTACHED_ACTORS -#ifdef BUFFS for (i = 0; i < NUM_BUFFS; i++) { our_actor->ec_buff_reference[i] = NULL; } -#endif // BUFFS #ifdef CLUSTER_INSIDES x = (int) (our_actor->x_pos / 0.5f); @@ -464,12 +460,10 @@ void draw_actor_banner(actor * actor_id, float offset_z) banner_width = ((float)get_string_width((unsigned char*)actor_id->actor_name)*(font_size_x*name_zoom))/2.0; draw_ortho_ingame_string(hx-banner_width, hy+healthbar_y_len/2.0f, hz, temp, 1, font_size_x, font_size_y); } -#ifdef BUFFS if (view_buffs) { draw_buffs(actor_id->actor_id, hx, hy + buff_icon_size, hz); } -#endif // BUFFS if((view_hp || view_health_bar) && actor_id->cur_health > 0 && actor_id->max_health > 0 && (!actor_id->dead) && (actor_id->kind_of_actor != NPC)){ unsigned char hp[200]; @@ -1464,10 +1458,12 @@ void add_actor_from_server (const char *in_data, int len) /* actors_list[i]->cur_anim_sound_cookie=0; */ /* actors_list[i]->IsOnIdle=0; */ } - } else actors_list[i]->calmodel=NULL; -#ifdef BUFFS + } + else + { + actors_list[i]->calmodel=NULL; + } update_actor_buffs(actor_id, buffs); -#endif // BUFFS UNLOCK_ACTORS_LISTS(); //unlock it #ifdef EXTRA_DEBUG ERR(); diff --git a/actors.h b/actors.h index 7553b813b..b26175cab 100644 --- a/actors.h +++ b/actors.h @@ -17,10 +17,8 @@ #include "client_serv.h" #include "platform.h" #include "tiles.h" -#ifdef BUFFS #include "buffs.h" #include "eye_candy_types.h" -#endif // BUFFS #ifdef __cplusplus extern "C" { @@ -641,10 +639,7 @@ typedef struct #ifdef CLUSTER_INSIDES short cluster; #endif - -#ifdef BUFFS ec_reference ec_buff_reference[NUM_BUFFS]; -#endif }actor; #define DEFAULT_RENDER_PASS 0 diff --git a/buffs.c b/buffs.c index 55c3ea567..07f925b9e 100644 --- a/buffs.c +++ b/buffs.c @@ -5,7 +5,6 @@ * Author: superfloh */ -#ifdef BUFFS #include "buffs.h" #include "client_serv.h" @@ -17,7 +16,7 @@ #include "textures.h" int view_buffs = 1; -int buff_icon_size = 32; +int buff_icon_size = 25; void update_actor_buffs(int actor_id, Uint32 in_buffs) { @@ -244,5 +243,3 @@ void draw_buffs(int actor_id, float x, float y,float z) #endif //OPENGL_TRACE } } - -#endif // BUFFS diff --git a/buffs.h b/buffs.h index 097f3efa5..e492b34a6 100644 --- a/buffs.h +++ b/buffs.h @@ -8,8 +8,6 @@ #ifndef BUFFS_H_ #define BUFFS_H_ -#ifdef BUFFS - #include "platform.h" // keep in sync with client_serv.h !!! @@ -33,6 +31,4 @@ void draw_buffs(int, float x, float y,float z); void update_buff_eye_candy(int actor_id); -#endif // BUFFS - #endif /* BUFFS_H_ */ diff --git a/multiplayer.c b/multiplayer.c index 0218da9d3..145a2acff 100644 --- a/multiplayer.c +++ b/multiplayer.c @@ -8,6 +8,7 @@ #include "actor_scripts.h" #include "books.h" #include "buddy.h" +#include "buffs.h" #include "chat.h" #include "console.h" #include "dialogues.h" @@ -49,10 +50,6 @@ #include "popup.h" #include "missiles.h" -#ifdef BUFFS -#include "buffs.h" -#endif // BUFFS - /* NOTE: This file contains implementations of the following, currently unused, and commented functions: * Look at the end of the file. * @@ -1731,9 +1728,7 @@ void process_message_from_server (const Uint8 *in_data, int data_length) #ifdef BUFF_DEBUG printf("SEND_BUFFS received\n"); #endif // BUFF_DEBUG -#ifdef BUFFS update_actor_buffs(SDL_SwapLE16(*((short *)(in_data+3))), SDL_SwapLE32(*((Uint32 *)(in_data+5)))); -#endif // BUFFS break; case SEND_SPECIAL_EFFECT: diff --git a/new_actors.c b/new_actors.c index 235df22f8..4f7589d9d 100644 --- a/new_actors.c +++ b/new_actors.c @@ -6,6 +6,7 @@ #include "actor_scripts.h" #include "asc.h" #include "bbox_tree.h" +#include "buffs.h" #include "cal.h" #include "console.h" #include "dialogues.h" @@ -28,9 +29,6 @@ #endif #include "io/elfilewrapper.h" #include "actor_init.h" -#ifdef BUFFS -#include "buffs.h" -#endif // BUFFS float sitting=1.0f; glow_color glow_colors[10]; @@ -1086,10 +1084,7 @@ void add_enhanced_actor_from_server (const char *in_data, int len) if (actor_id == yourself) { reset_camera_at_next_update = 1; } -#ifdef BUFFS update_actor_buffs(actor_id, buffs); -#endif // BUFFS - UNLOCK_ACTORS_LISTS(); //unlock it #ifdef EXTRA_DEBUG ERR();