[Lincity-commits] CVS: lincity CHANGES,1.9,1.10 confw32.h,1.10,1.11 geometry.c,1.24,1.25 lincity.dsp,1.3,1.4

[Gregory S. <gre...@us...>]

Update of /cvsroot/lincity/lincity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15184

Modified Files:
	CHANGES confw32.h geometry.c lincity.dsp 
Log Message:
Updates for 1.13.3.


Index: CHANGES
===================================================================
RCS file: /cvsroot/lincity/lincity/CHANGES,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CHANGES	1 Aug 2004 16:17:13 -0000	1.9
--- CHANGES	4 Feb 2005 03:43:07 -0000	1.10
***************
*** 1,3 ****
--- 1,9 ----
  
+ 1.13.3
+ ******
+ - Fix problem loading iso-8859-2 font
+ - Revise pollution code for tech > 1000
+ - Add Taj's autopackage & binreloc patch
+ 
  1.13.2 (win32 only)
  *******************

Index: confw32.h
===================================================================
RCS file: /cvsroot/lincity/lincity/confw32.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** confw32.h	1 Aug 2004 16:17:13 -0000	1.10
--- confw32.h	4 Feb 2005 03:43:07 -0000	1.11
***************
*** 93,95 ****
  
  /* Version number of package */
! #define VERSION "1.13.2"
--- 93,95 ----
  
  /* Version number of package */
! #define VERSION "1.13.3"

Index: geometry.c
===================================================================
RCS file: /cvsroot/lincity/lincity/geometry.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** geometry.c	3 Jul 2004 06:08:49 -0000	1.24
--- geometry.c	4 Feb 2005 03:43:07 -0000	1.25
***************
*** 188,200 ****
      scr->time_for_year.w = 0;  /* unused */
  
!     scr->status_message_1.x = scr->main_win.x;
      scr->status_message_1.y = STATUS_MESSAGE_1_Y;
      scr->status_message_1.h = 8;
!     scr->status_message_1.w = scr->main_win.w;
  
!     scr->status_message_2.x = scr->main_win.x;
      scr->status_message_2.y = STATUS_MESSAGE_2_Y;
      scr->status_message_2.h = 8;
!     scr->status_message_2.w = scr->main_win.w;
  
      scr->mini_map.x = MINI_SCREEN_X;
--- 188,200 ----
      scr->time_for_year.w = 0;  /* unused */
  
!     scr->status_message_1.x = scr->main_win.x + 32;
      scr->status_message_1.y = STATUS_MESSAGE_1_Y;
      scr->status_message_1.h = 8;
!     scr->status_message_1.w = scr->main_win.w - 32;
  
!     scr->status_message_2.x = scr->main_win.x + 32;
      scr->status_message_2.y = STATUS_MESSAGE_2_Y;
      scr->status_message_2.h = 8;
!     scr->status_message_2.w = scr->main_win.w - 32;
  
      scr->mini_map.x = MINI_SCREEN_X;
***************
*** 319,325 ****
      scr.time_for_year.y = TIME_FOR_YEAR_Y + (scr.client_h - 480);
      scr.status_message_1.y = STATUS_MESSAGE_1_Y + (scr.client_h - 480);
!     scr.status_message_1.w = scr.main_win.w;
      scr.status_message_2.y = STATUS_MESSAGE_2_Y + (scr.client_h - 480);
!     scr.status_message_2.w = scr.main_win.w;
  
      scr.date.y = scr.main_win.y + scr.main_win.h + 16;
--- 319,325 ----
      scr.time_for_year.y = TIME_FOR_YEAR_Y + (scr.client_h - 480);
      scr.status_message_1.y = STATUS_MESSAGE_1_Y + (scr.client_h - 480);
!     scr.status_message_1.w = scr.main_win.w - 32;
      scr.status_message_2.y = STATUS_MESSAGE_2_Y + (scr.client_h - 480);
!     scr.status_message_2.w = scr.main_win.w - 32;
  
      scr.date.y = scr.main_win.y + scr.main_win.h + 16;

Index: lincity.dsp
===================================================================
RCS file: /cvsroot/lincity/lincity/lincity.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lincity.dsp	1 Aug 2004 16:17:13 -0000	1.3
--- lincity.dsp	4 Feb 2005 03:43:07 -0000	1.4
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
! # ADD CPP /nologo /W3 /GX /O2 /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 44,49 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
! # ADD CPP /W3 /GX /O2 /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
! # SUBTRACT CPP /nologo /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 70,74 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 71,76 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /W3 /Gm /GX /ZI /Od /I "gettext-w32" /I "libpng-1.2.5" /I "zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /FD /GZ /c
! # SUBTRACT CPP /nologo /YX
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 349,352 ****
--- 351,358 ----
  # Begin Source File
  
+ SOURCE=.\confw32.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\getopt.h
  # End Source File