From 46c229a5725e4db1cda5e15e4ebdd5cc15404460 Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Tue, 29 Jan 2008 15:57:59 +0000
Subject: [PATCH] Renaming udp.* to netdrv_udp.* to fit naming convention;
 Small menu ui fixes

---
 CHANGELOG.txt                | 1 +
 SConstruct                   | 2 +-
 main/{udp.c => netdrv_udp.c} | 2 +-
 main/{udp.h => netdrv_udp.h} | 0
 main/newmenu.c               | 6 +++---
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename main/{udp.c => netdrv_udp.c} (99%)
 rename main/{udp.h => netdrv_udp.h} (100%)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b08648705..cd6226a17 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20080129
 --------
 SConstruct, arch/include/mouse.h, arch/ogl/gr.c, arch/ogl/ogl.c, arch/ogl/sdlgl.c, arch/sdl/mouse.c, include/internal.h, main/kconfig.c: Cleanung up arch/ a little bit; Added mouse delta time interval for more more accurate reading at high FPS
+SConstruct, main/netdrv_udp.c, main/netdrv_udp.h, main/newmenu.c: Renaming udp.* to netdrv_udp.* to fit naming convention; Small menu ui fixes
 
 20080125
 --------
diff --git a/SConstruct b/SConstruct
index ad7a667f5..7c6db7969 100644
--- a/SConstruct
+++ b/SConstruct
@@ -132,6 +132,7 @@ common_sources = [
 'main/multi.c',
 'main/multibot.c',
 'main/netdrv.c',
+'main/netdrv_udp.c',
 'main/netpkt.c',
 'main/network.c',
 'main/newdemo.c',
@@ -156,7 +157,6 @@ common_sources = [
 'main/texmerge.c',
 'main/text.c',
 'main/titles.c',
-'main/udp.c',
 'main/vclip.c',
 'main/wall.c',
 'main/weapon.c',
diff --git a/main/udp.c b/main/netdrv_udp.c
similarity index 99%
rename from main/udp.c
rename to main/netdrv_udp.c
index db19e87c3..df2a854be 100755
--- a/main/udp.c
+++ b/main/netdrv_udp.c
@@ -26,7 +26,7 @@
 #include "netdrv.h"
 #include "network.h"
 #include "timer.h"
-#include "udp.h"
+#include "netdrv_udp.h"
 #include "key.h"
 #include "text.h"
 
diff --git a/main/udp.h b/main/netdrv_udp.h
similarity index 100%
rename from main/udp.h
rename to main/netdrv_udp.h
diff --git a/main/newmenu.c b/main/newmenu.c
index b3a0d3fb9..89446fad2 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -109,8 +109,8 @@ grs_bitmap nm_background,nm_background1,nm_background_save;
 #define MESSAGEBOX_TEXT_SIZE 2176   // How many characters in messagebox (changed form 300 (fixes crash from show_game_score and friends) - 2000/01/18 Matt Mueller)
 #define MAX_TEXT_WIDTH 	FONTSCALE_X((HiresGFX)?240:120)				// How many pixels wide a input box can be
 
-#define MENSCALE_X ((HiresGFX)?(SWIDTH/640):(SWIDTH/320))
-#define MENSCALE_Y ((HiresGFX)?(SHEIGHT/480):(SHEIGHT/200))
+#define MENSCALE_X ((HiresGFX)?((float)SWIDTH/640):((float)SWIDTH/320))
+#define MENSCALE_Y ((HiresGFX)?((float)SHEIGHT/480):((float)SHEIGHT/200))
 
 ubyte MenuReordering=0;
 ubyte SurfingNet=0;
@@ -295,7 +295,7 @@ void nm_string( bkg * b, int w1,int x, int y, char * s)
 	s2 = d_strdup(s);
 
 	for (i=0;i<6;i++) {
-		XTabs[i]=FONTSCALE_X(LHX(XTabs[i]));
+		XTabs[i]=LHX(XTabs[i]);
 		XTabs[i]+=x;
 	}