* Removed #ifdef's:

AFK_FIX (on) ALUT_WAV (off) ATI_9200_FIX (on) AUTO_UPDATE (on) CLICKABLE_CONTINENT_MAP (on) COUNTERS (on) CXX_MISC (on) EYE_CANDY (on) FONTS_FIX (on) IDLE_FIX (on) MINES (on) MINIMAP (on) NEW_ACTOR_SCALE (on) NEW_FILE_IO (on) NOTEPAD (on) OGG_VORBIS (on) OLD_TEXTURE_LOADER (off) OPTIONS_I18N (on) SDL_REINIT (off) SFX (on) USE_SEND_VIDEO_INFO (on)
raduprv · Feb 12, 2008 · dfeda1d · dfeda1d
1 parent 45e61fd
commit dfeda1d
Show file tree

Hide file tree

Showing 130 changed files with 23 additions and 2,448 deletions.
diff --git a/2d_objects.c b/2d_objects.c
@@ -14,9 +14,7 @@
 #include "textures.h"
 #include "tiles.h"
 #include "translate.h"
-#ifdef	NEW_FILE_IO
 #include "io/elfilewrapper.h"
-#endif	//NEW_FILE_IO
 #ifdef OPENGL_TRACE
 #include "gl_init.h"
 #endif
@@ -181,18 +179,11 @@ obj_2d_def * load_obj_2d_def(char *file_name)
 {
 	int f_size;
 	int i,k,l;
-#ifndef	NEW_FILE_IO
-	FILE *f = NULL;
-#else	//NEW_FILE_IO
 	el_file_ptr file = NULL;
-#endif	//NEW_FILE_IO
 	char cur_dir[200]={0};
 	obj_2d_def *cur_object;
 	char *obj_file_mem;
 	char texture_file_name[256] = {0};
-#ifndef	NEW_FILE_IO
-	char *handle_obj_file_mem;
-#endif	//NEW_FILE_IO
 	float x_size,y_size;
 	float alpha_test;
 	int file_x_len;
@@ -222,23 +213,6 @@ obj_2d_def * load_obj_2d_def(char *file_name)
 		}
 
 
-#ifndef	NEW_FILE_IO
-	f = my_fopen (file_name, "rb");
-	if(!f)
-	{
-		free(cur_object);
-		return NULL;
-	}
-	fseek (f, 0, SEEK_END);
-	f_size = ftell (f);
-
-	//ok, allocate memory for it
-	obj_file_mem = calloc ( f_size+1, sizeof(char) );
-	handle_obj_file_mem = obj_file_mem;
-	fseek (f, 0, SEEK_SET);
-	fread (obj_file_mem, 1, f_size, f);
-	fclose (f);
-#else	//NEW_FILE_IO
 	file = el_open(file_name);
 	if(file == NULL){
 		LOG_ERROR("%s: %s \"%s\"\n", reg_error_str, cant_open_file, file_name);
@@ -249,7 +223,6 @@ obj_2d_def * load_obj_2d_def(char *file_name)
 	obj_file_mem = el_get_pointer(file);
 
 	f_size = el_get_size(file);
-#endif	//NEW_FILE_IO
 
 	//ok, the file is loaded, so parse it
 	file_x_len=get_integer_after_string("file_x_len:",obj_file_mem,f_size);
@@ -339,11 +312,7 @@ obj_2d_def * load_obj_2d_def(char *file_name)
 					break;
 				}
 		}
-#ifndef	NEW_FILE_IO
-	free(handle_obj_file_mem);
-#else	//NEW_FILE_IO
 	el_close(file);
-#endif	//NEW_FILE_IO
 
 	return cur_object;
 }

diff --git a/3d_objects.c b/3d_objects.c
@@ -30,9 +30,7 @@ Uint32 highest_obj_3d= 0;
 int objects_list_placeholders = 0;
 object3d *objects_list[MAX_OBJ_3D];
 
-#ifdef EYE_CANDY
  #include "eye_candy_wrapper.h"
-#endif
 
 e3d_object *load_e3d (const char *file_name);
 void compute_clouds_map(object3d * object_id);
@@ -553,11 +551,9 @@ int add_e3d_at_id (int id, const char *file_name, float x_pos, float y_pos, floa
 	if (strcasecmp(file_name, "") && strcasecmp(strrchr(file_name, '/')+1, "bag1.e3d") == 0) {
 		our_object->flags |= OBJ_3D_BAG;
 	}
-#ifdef MINES
 	if (strcasecmp(file_name, "") && strcasecmp(strrchr(file_name, '/')+1, "branch1.e3d") == 0) {
 		our_object->flags |= OBJ_3D_MINE;
 	}
-#endif // MINES
 
 #ifdef CLUSTER_INSIDES
 	our_object->cluster = get_cluster ((int)(x_pos/0.5f), (int)(y_pos/0.5f));
@@ -593,11 +589,9 @@ int add_e3d_at_id (int id, const char *file_name, float x_pos, float y_pos, floa
 		else add_3dobject_to_abt(main_bbox_tree, get_3dobject_id(id, i), bbox, blended, ground, is_transparent, self_lit, texture_id, dynamic);
 	}
 
-#ifdef EYE_CANDY
 	ec_add_object_obstruction(our_object, returned_e3d, 2.0);
 //        printf("Bounding: %f, %f, %f -> %f, %f, %f\n", returned_e3d->min_x, returned_e3d->min_y, returned_e3d->min_z, returned_e3d->max_x, returned_e3d->max_y, returned_e3d->max_z);
 //	printf("Rotation: %f, %f, %f\n", our_object->x_rot, our_object->y_rot, our_object->z_rot);
-#endif	// EYE_CANDY
 
 	return id;
 }
@@ -817,9 +811,7 @@ void destroy_3d_object(int i)
 	if ((i < 0) || (i >= MAX_OBJ_3D)) return;
 	if (objects_list[i] == NULL) return;
 
-#ifdef  EYE_CANDY
 	ec_remove_obstruction_by_object3d(objects_list[i]);
-#endif
 
 	delete_3dobject_from_abt(main_bbox_tree, i, objects_list[i]->blended, objects_list[i]->self_lit);
 	free(objects_list[i]);
@@ -869,9 +861,7 @@ void destroy_e3d(e3d_object *e3d_id)
 	e3d_id->materials= NULL;
 	// and finally free the main object
 
-#ifdef EYE_CANDY
 	ec_remove_obstruction_by_e3d_object(e3d_id);
-#endif	// EYE_CANDY
 
 	free(e3d_id);
 }

diff --git a/Makefile.linux b/Makefile.linux
@@ -10,31 +10,21 @@ CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --
 _CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
 
 ZLIB_LIBS = -lz
-NEW_FILE_IO_LIBS = -lz
-EYE_CANDY_LIBS = -lpng
 PNG_SCREENSHOT_LIBS = -lpng
-OGG_VORBIS_LIBS = -lvorbis -lvorbisfile
-LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lalut \
+LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lalut -lz -lpng -lvorbis -lvorbisfile \
 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
 _LDFLAGS=$(XDIR) -lGL -lpthread -lz
 STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a libs/libpng.a libs/libasound.a $(EXTRA_STATICLIBS)
 
 # the objects we need
 ENCYCLOPEDIA_COBJ = books/fontdef.o books/parser.o books/symbol.o books/typesetter.o sort.o symbol_table.o
 MEMORY_DEBUG_COBJ = elmemory.o
-NOTEPAD_COBJ = notepad.o
 POPUP_COBJ = popup.o
-SFX_COBJ = special_effects.o
-MINIMAP_COBJ = minimap.o
 MISSILES_COBJ = missiles.o
 SKY_FPV_CURSOR_COBJ = sky.o
-NEW_FILE_IO_CXXOBJ = io/elfilewrapper.o io/elfile.o io/zipfilesystem.o
-NEW_FILE_IO_COBJ = io/elpathwrapper.o io/xmlcallbacks.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
-USE_SEND_VIDEO_INFO_CXXOBJ = sendvideoinfo.o
-CXX_MISC_CXXOBJ = exceptions/extendedexception.o xml/xmlhelper.o
 NEW_SELECTION_CXXOBJ = select.o
 COBJS=2d_objects.o 3d_objects.o \
 	actor_scripts.o actors.o alphamap.o asc.o astrology.o \
@@ -45,21 +35,24 @@ COBJS=2d_objects.o 3d_objects.o \
 	filter.o font.o framebuffer.o frustum.o	\
 	gamewin.o gl_init.o hud.o help.o highlight.o	\
 	ignore.o init.o interface.o items.o	\
-	io/e3d_io.o io/elc_io.o	io/map_io.o	\
+	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
 	main.o manufacture.o map.o mapwin.o	\
-	md5.o mines.o misc.o multiplayer.o	\
-	new_actors.o new_character.o 	\
+	md5.o mines.o minimap.o misc.o multiplayer.o	\
+	new_actors.o new_character.o notepad.o	\
 	openingwin.o	\
 	particles.o paste.o pathfinder.o pm_log.o	\
 	questlog.o queue.o reflection.o	rules.o	\
 	skeletons.o skills.o serverpopup.o servers.o session.o shadows.o sound.o	\
-	spells.o stats.o storage.o	\
+	spells.o stats.o storage.o special_effects.o	\
 	tabs.o text.o textures.o tile_map.o timers.o translate.o trade.o	\
 	update.o url.o weather.o widgets.o \
 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
 
-EYE_CANDY_CXXOBJ = eye_candy_wrapper.o \
+CXXOBJS=cal3d_wrapper.o actor_init.o optimizer.o sendvideoinfo.o	\
+	exceptions/extendedexception.o xml/xmlhelper.o	\
+	io/elfilewrapper.o io/elfile.o io/zipfilesystem.o \
+	eye_candy_wrapper.o \
 	eye_candy/eye_candy.o eye_candy/math_cache.o eye_candy/effect_lamp.o \
 	eye_candy/effect_candle.o \
 	eye_candy/effect_campfire.o eye_candy/effect_fountain.o \
@@ -70,8 +63,7 @@ EYE_CANDY_CXXOBJ = eye_candy_wrapper.o \
 	eye_candy/effect_smoke.o eye_candy/effect_bag.o eye_candy/effect_cloud.o \
 	eye_candy/effect_harvesting.o eye_candy/effect_wind.o \
 	eye_candy/effect_breath.o eye_candy/effect_mines.o \
-	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o
-CXXOBJS=cal3d_wrapper.o actor_init.o optimizer.o \
+	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o	\
 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
 
 OBJS=$(COBJS) $(CXXOBJS)

diff --git a/Makefile.win b/Makefile.win
@@ -26,44 +26,40 @@ STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a
 # the objects we need
 ENCYCLOPEDIA_COBJ = books/fontdef.o books/parser.o books/symbol.o books/typesetter.o sort.o symbol_table.o
 MEMORY_DEBUG_COBJ = elmemory.o
-NOTEPAD_COBJ = notepad.o
 POPUP_COBJ = popup.o
-SFX_COBJ = special_effects.o
-MINIMAP_COBJ = minimap.o
 MISSILES_COBJ = missiles.o
 SKY_FPV_CURSOR_COBJ = sky.o
-NEW_FILE_IO_CXXOBJ = io/elfilewrapper.o io/elfile.o io/zipfilesystem.o
-NEW_FILE_IO_COBJ = io/elpathwrapper.o io/xmlcallbacks.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
-USE_SEND_VIDEO_INFO_CXXOBJ = sendvideoinfo.o
-CXX_MISC_CXXOBJ = exceptions/extendedexception.o xml/xmlhelper.o
 NEW_SELECTION_CXXOBJ = select.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 \
 	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	\
+	counters.o cursors.o dialogues.o draw_scene.o eye_candy_debugwin.o \
 	elconfig.o elwindows.o encyclopedia.o errors.o events.o	\
 	filter.o font.o framebuffer.o frustum.o	\
 	gamewin.o gl_init.o hud.o help.o highlight.o	\
 	ignore.o init.o interface.o items.o	\
-	io/e3d_io.o io/elc_io.o	io/map_io.o \
+	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
 	main.o manufacture.o map.o mapwin.o	\
-	md5.o mines.o misc.o multiplayer.o	\
-	new_actors.o new_character.o 	\
+	md5.o mines.o minimap.o misc.o multiplayer.o	\
+	new_actors.o new_character.o notepad.o	\
 	openingwin.o	\
 	particles.o paste.o pathfinder.o pm_log.o	\
 	questlog.o queue.o reflection.o	rules.o	\
 	skeletons.o skills.o serverpopup.o servers.o session.o shadows.o sound.o	\
-	spells.o stats.o storage.o	\
+	spells.o stats.o storage.o special_effects.o	\
 	tabs.o text.o textures.o tile_map.o timers.o translate.o trade.o	\
 	update.o url.o weather.o widgets.o \
 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
 
-EYE_CANDY_CXXOBJ = eye_candy_wrapper.o \
+CXXOBJS=cal3d_wrapper.o actor_init.o optimizer.o sendvideoinfo.o	\
+	exceptions/extendedexception.o xml/xmlhelper.o	\
+	io/elfilewrapper.o io/elfile.o io/zipfilesystem.o \
+	eye_candy_wrapper.o \
 	eye_candy/eye_candy.o eye_candy/math_cache.o eye_candy/effect_lamp.o \
 	eye_candy/effect_candle.o \
 	eye_candy/effect_campfire.o eye_candy/effect_fountain.o \
@@ -74,8 +70,7 @@ EYE_CANDY_CXXOBJ = eye_candy_wrapper.o \
 	eye_candy/effect_smoke.o eye_candy/effect_bag.o eye_candy/effect_cloud.o \
 	eye_candy/effect_harvesting.o eye_candy/effect_wind.o \
 	eye_candy/effect_breath.o eye_candy/effect_mines.o \
-	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o
-CXXOBJS=cal3d_wrapper.o actor_init.o optimizer.o \
+	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o	\
 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
 
 OBJS=$(COBJS) $(CXXOBJS)