date:20070206

[Warzone-dev] Odds ends

2007-02-06 Thread Christian Ohm


Hello everyone,

Here are a few comments and things I've noticed recently:

- In the trunk the selection box is filled with a transparent overlay,
  which is 1 pixel too narrow and too low. The first attached patch
  fixes that, but the actual error might be hidden somewhere deeper.

- The attached patch also disables the pulsing of the selection box. I
  think the pulsing is irritating, since the selection box usually isn't
  even on-screen for one pulse cycle (at least for my usage).  That part
  is mainly a request for comments and should be made configurable.

- The radar view indicator fix and possibly the fixed selection box
  patch could both be applied to 2.0.

- 2.0 doesn't include some of the g++ fixes, thus RegFilePath is defined
  twice. That might be the cause of the empty config file problem, the
  second attached patch fixes the double definition.

- When using the Windows installer for 2.0.5 as a regular user, when
  selecting a write-protected directory the installer just aborts
  instead of offering to select another directory.

- The german description of Grim's graphics update in the installer was
  somewhat strange.

-- 
Does the name Pavlov ring a bell?
=== src/display3d.c
==
--- src/display3d.c	(revision 733)
+++ src/display3d.c	(local)
@@ -3476,11 +3476,13 @@
 		minY = min(dragBox3D.y1, mY);
 		maxY = max(dragBox3D.y1, mY);
 
+#if 0
 		// SHURCOOL: Reduce the box in size to produce a (consistent) pulsing inward effect
 		minX += dragBox3D.boxColourIndex/2;
 		maxX -= dragBox3D.boxColourIndex/2;
 		minY += dragBox3D.boxColourIndex/2;
 		maxY -= dragBox3D.boxColourIndex/2;
+#endif
 
 		pie_SetDepthBufferStatus(DEPTH_CMP_ALWAYS_WRT_OFF);
 	   	iV_Box(minX, minY,
@@ -3489,7 +3491,7 @@
 		if (war_GetTranslucent())
 		{
   			pie_UniTransBoxFill(minX+1, minY+1,
-  	maxX-1, maxY-1,
+  	maxX, maxY,
   	0x00ff, 16);
 		}
 		pie_SetDepthBufferStatus(DEPTH_CMP_LEQ_WRT_ON);
=== src/main.c
==
--- src/main.c	(revision 717)
+++ src/main.c	(revision 718)
@@ -22,6 +22,7 @@
  *
  */
 #include lib/framework/frame.h
+#include lib/framework/configfile.h
 
 /* For SHGetFolderPath */
 #if defined(WIN32)
@@ -104,7 +105,6 @@
 char	MultiPlayersPath[MAX_PATH];
 char	KeyMapPath[MAX_PATH];
 char	UserMusicPath[MAX_PATH];
-char	RegFilePath[MAX_PATH];
 
 void debug_callback_stderr( void**, const char * );
 void debug_callback_win32debug( void**, const char * );
=== lib/framework/configfile.h
==
--- lib/framework/configfile.h	(revision 717)
+++ lib/framework/configfile.h	(revision 718)
@@ -28,3 +28,5 @@
 extern BOOL setWarzoneKeyNumeric	(STRING *pName,SDWORD val);
 extern BOOL getWarzoneKeyString(STRING *pName, STRING *pString);
 extern BOOL setWarzoneKeyString(STRING *pName, STRING *pString);
+
+extern char RegFilePath[MAX_PATH];
___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev

Re: [Warzone-dev] Odds ends

2007-02-06 Thread Dennis Schridde

Am Dienstag, 6. Februar 2007 schrieb Christian Ohm:
 Hello everyone,

 Here are a few comments and things I've noticed recently:

 - In the trunk the selection box is filled with a transparent overlay,
   which is 1 pixel too narrow and too low. The first attached patch
   fixes that, but the actual error might be hidden somewhere deeper.

 - The attached patch also disables the pulsing of the selection box. I
   think the pulsing is irritating, since the selection box usually isn't
   even on-screen for one pulse cycle (at least for my usage).  That part
   is mainly a request for comments and should be made configurable.
I think it looks a little bit cool...

 - The radar view indicator fix and possibly the fixed selection box
   patch could both be applied to 2.0.
Yes, that would be nice.

 - 2.0 doesn't include some of the g++ fixes, thus RegFilePath is defined
   twice. That might be the cause of the empty config file problem, the
   second attached patch fixes the double definition.
The debug output clearly says that it wants to write file config of size 0. 
So I think the RegFilePath is setup correctly and handed through the various 
sourcecode files correctly.
Will include the patch anyway.

 - When using the Windows installer for 2.0.5 as a regular user, when
   selecting a write-protected directory the installer just aborts
   instead of offering to select another directory.
I can have a look whether there is any example on the NSIS pages, showing how 
to do this. But currently I think this is more a fault of NSIS and is thus 
out of reach.

 - The german description of Grim's graphics update in the installer was
   somewhat strange.
Written by me. ;) What's strange with it?
(BTW: I just recognized that the english version should have the same 
strange description, but I mixed up TEXT and DESC, what might be the reason 
it is not shown.)

  LangString TEXT_SecGrimMod ${LANG_ENGLISH} Grim's art update. Replaces 
campaign 1 textures with more detailed ones. Also includes some other texture 
and model updates. License: NON GPL: Copyright by Grim. Use is only permited 
for Warzone 2100 GPL.
  LangString DESC_SecGrimMod ${LANG_ENGLISH} Grim's art update

  LangString TEXT_SecGrimMod ${LANG_GERMAN} Grims Grafik Update
  LangString DESC_SecGrimMod ${LANG_GERMAN} Grims Grafik Update. Ersetzt 
Kampagne 1 Texturen mit Detailieren. Enth�t auch einige andere Textur und 
Model updates. Lizenz: Nicht GPL: Copyright by Grim. Verwendung nur fr 
Warzone 2100 GPL gestattet.


pgpozKAYWc5ga.pgp
Description: PGP signature
___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev

[Warzone-dev] Scriptai.c errors?

2007-02-06 Thread vs2k5

Who made the changes in this part/file ?
It crashes when you load a level now :(

==
//if (psStats-numWeaps == 0  psStats-pSensor != NULL)
if (psStats-psWeapStat == NULL  psStats-pSensor != NULL)
{
mask = SCR_ST_SENSOR;
}
//else if (psStats-numWeaps  0)
else if (psStats-psWeapStat != NULL)
{
//psWStats = psStats-asWeapList[0];
psWStats = psStats-psWeapStat[0];
if (!proj_Direct(psWStats))
** crash here  psWstats = undefined.
--  
+   psStats-psWeapStat[0]  0x {ref=??? pName=??? 
techLevel=??? ...}  _weapon_stats *
-
+   psStats-psWeapStat 0x086480c4  _weapon_stats * [4]
--
+   psStats 0x08648068 {ref=852072 pName=0x0859c7e4 Sys-
SensoTower02 type=6 ...}   _structure_stats *




--
Save Money on your Auto Insurance
Compare multiple insurance quotes to save with NetQuote's free service
http://tagline.hushmail.com/fc/MhtZOXMl75uGuNKsRsU8Edw8XcNTWgvw0T6sg/


___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev

Re: [Warzone-dev] Scriptai.c errors?

2007-02-06 Thread vs2k5

On Tue, 06 Feb 2007 17:57:32 -0500 [EMAIL PROTECTED] wrote:
Who made the changes in this part/file ?
It crashes when you load a level now :(

==
   //if (psStats-numWeaps == 0  psStats-pSensor != NULL)
if (psStats-psWeapStat == NULL  psStats-pSensor != 
NULL)
   {
   mask = SCR_ST_SENSOR;
   }
   //else if (psStats-numWeaps  0)
else if (psStats-psWeapStat != NULL)
   {
   //psWStats = psStats-asWeapList[0];
psWStats = psStats-psWeapStat[0];
   if (!proj_Direct(psWStats))
** crash here  psWstats = undefined.
--  
+  psStats-psWeapStat[0]  0x {ref=??? pName=??? 
techLevel=??? ...} _weapon_stats *
-
+  psStats-psWeapStat 0x086480c4  _weapon_stats * [4]
--
+  psStats 0x08648068 {ref=852072 pName=0x0859c7e4 Sys-
SensoTower02 type=6 ...}  _structure_stats *

Forgot to mention, this is level CAM_2A




--
Free Tradeshow Display Price Quotes
Compare tradeshow display prices from multiple suppliers and save!
http://tagline.hushmail.com/fc/MhtZOXMo4XV9nT2pE2BGy5IOEuA1iH211MEWR/


___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev

Re: [Warzone-dev] Scriptai.c errors?

2007-02-06 Thread Giel van Schijndel

[EMAIL PROTECTED] schreef:
 Who made the changes in this part/file ?
 It crashes when you load a level now :(

 ==
   //if (psStats-numWeaps == 0  psStats-pSensor != NULL)
 if (psStats-psWeapStat == NULL  psStats-pSensor != NULL)
   {
   mask = SCR_ST_SENSOR;
   }
   //else if (psStats-numWeaps  0)
 else if (psStats-psWeapStat != NULL)
   {
   //psWStats = psStats-asWeapList[0];
 psWStats = psStats-psWeapStat[0];
   if (!proj_Direct(psWStats))
 ** crash here  psWstats = undefined.
 --  
 + psStats-psWeapStat[0]  0x {ref=??? pName=??? 
 techLevel=??? ...}_weapon_stats *
 -
 + psStats-psWeapStat 0x086480c4  _weapon_stats * [4]
 --
 + psStats 0x08648068 {ref=852072 pName=0x0859c7e4 Sys-
 SensoTower02 type=6 ...} _structure_stats *
   
`svn blame' is your friend for what you're trying to do here.

just hit `svn blame http://svn.gna.org/svn/warzone/trunk/src/scriptai.c'
on you console and you should see who and when the current line is changed.

As for that ^^ I'm not sure what line numbers you are referring to, so I
took a guess: 916-926 of r714.

Listed below:
 line   revdate  
 author content

916  419-11-2005 20:12:57
 perif (psStats-psWeapStat == NULL
  psStats-pSensor != NULL)
917  419-11-2005 20:12:57
 per{
918  419-11-2005 20:12:57
 permask = SCR_ST_SENSOR;
919  419-11-2005 20:12:57
 per}
920  419-11-2005 20:12:57
 per//else if (psStats-numWeaps  0)
921  419-11-2005 20:12:57
 perelse if (psStats-psWeapStat !=
 NULL)
922  419-11-2005 20:12:57
 per{
923  419-11-2005 20:12:57
 per//psWStats =
 psStats-asWeapList[0];
92449925-11-2006 18:38:27
 troman psWStats =
 psStats-psWeapStat[0];
925  419-11-2005 20:12:57
 perif (!proj_Direct(psWStats))
926  419-11-2005 20:12:57
 per{
-- 
Giel




signature.asc
Description: OpenPGP digital signature
___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev

Re: [Warzone-dev] Scriptai.c errors?

2007-02-06 Thread vs2k5

On Tue, 06 Feb 2007 18:09:18 -0500 Giel van Schijndel 
[EMAIL PROTECTED] wrote:
[EMAIL PROTECTED] schreef:
 Who made the changes in this part/file ?
 It crashes when you load a level now :(

As for that ^^ I'm not sure what line numbers you are referring 
to, so I
took a guess: 916-926 of r714.

Listed below:
 line   revdate  
 author content

916  419-11-2005 20:12:57
 perif (psStats-psWeapStat 
== NULL
  psStats-pSensor != NULL)
917  419-11-2005 20:12:57
 per{
918  419-11-2005 20:12:57
 permask = SCR_ST_SENSOR;
919  419-11-2005 20:12:57
 per}
920  419-11-2005 20:12:57
 per//else if (psStats-
numWeaps  0)
921  419-11-2005 20:12:57
 perelse if (psStats-
psWeapStat !=
 NULL)
922  419-11-2005 20:12:57
 per{
923  419-11-2005 20:12:57
 per//psWStats =
 psStats-asWeapList[0];
92449925-11-2006 18:38:27
 troman psWStats =
 psStats-psWeapStat[0];
925  419-11-2005 20:12:57
 perif 
(!proj_Direct(psWStats))
926  419-11-2005 20:12:57
 per{
-- 
Giel
I try that, and get a 'malformed network data' error?

Yes, it was those line ranges, but while it crashes there, I do not 
know if the commented out lines fix, since too much changed? 




--
Click to reduce wrinkles, increase energy and sex drive - anti-aging
http://tagline.hushmail.com/fc/CAaCXv1LY0UNAcdKHahMbiooHagnJpNm/


___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev

[Warzone-dev] Odds ends

Re: [Warzone-dev] Odds ends

[Warzone-dev] Scriptai.c errors?

Re: [Warzone-dev] Scriptai.c errors?

Re: [Warzone-dev] Scriptai.c errors?

Re: [Warzone-dev] Scriptai.c errors?

6 matches

Site Navigation

Mail list logo

Footer information