HalfLife texture transparency fixed, pmodel enhanced (Nehahra).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_main.c b/cl_main.c
index bcd3e47c96a98f69f9d32f2db65fcef60c795d3c..0a9d3879f1348699ae76162408a8ed4291ca93e7 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // these two are not intended to be set directly
 cvar_t cl_name = {"_cl_name", "player", true};
 cvar_t cl_color = {"_cl_color", "0", true};
+cvar_t cl_pmodel = {"_cl_pmodel", "0", true};
 
 cvar_t cl_shownet = {"cl_shownet","0"};        // can be 0, 1, or 2
 cvar_t cl_nolerp = {"cl_nolerp","0"};
@@ -197,10 +198,16 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon);
                MSG_WriteString (&cls.message, "prespawn");
                break;
                
-       case 2:         
+       case 2:
+               if (cl_pmodel.value)
+               {
+                       MSG_WriteByte (&cls.message, clc_stringcmd);
+                       MSG_WriteString (&cls.message, va("pmodel %f\n", cl_pmodel.value));
+               }
+
                MSG_WriteByte (&cls.message, clc_stringcmd);
                MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string));
-       
+
                MSG_WriteByte (&cls.message, clc_stringcmd);
                MSG_WriteString (&cls.message, va("color %i %i\n", ((int)cl_color.value)>>4, ((int)cl_color.value)&15));
        
@@ -791,6 +798,7 @@ void CL_Init (void)
 //
        Cvar_RegisterVariable (&cl_name);
        Cvar_RegisterVariable (&cl_color);
+       Cvar_RegisterVariable (&cl_pmodel);
        Cvar_RegisterVariable (&cl_upspeed);
        Cvar_RegisterVariable (&cl_forwardspeed);
        Cvar_RegisterVariable (&cl_backspeed);

diff --git a/client.h b/client.h
index c5cbffdea657911aa0f62eb949d1ecf08b67e40f..ca030ddcfba80674665393406120c2202ea08f72 100644 (file)
--- a/client.h
+++ b/client.h
@@ -232,6 +232,7 @@ typedef struct
 //
 extern cvar_t  cl_name;
 extern cvar_t  cl_color;
+extern cvar_t  cl_pmodel;
 
 extern cvar_t  cl_upspeed;
 extern cvar_t  cl_forwardspeed;

diff --git a/host_cmd.c b/host_cmd.c
index d70508ef5602f99a1c12fa8cefb65816b0818329..48149b1a09317631615adb57cdccf268b090b5bd 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -1650,13 +1650,16 @@ void Host_PModel_f (void)
 
        if (Cmd_Argc () == 1)
        {
-               Con_Printf ("usage: pmodel modelnumber\n");
+               Con_Printf ("\"pmodel\" is \"%s\"\n", cl_pmodel.string);
                return;
        }
        i = atoi(Cmd_Argv(1));
 
        if (cmd_source == src_command)
        {
+               if (cl_pmodel.value == i)
+                       return;
+               Cvar_SetValue ("_cl_pmodel", i);
                if (cls.state == ca_connected)
                        Cmd_ForwardToServer ();
                return;

diff --git a/model_brush.c b/model_brush.c
index e62b5272bfd0491aa021b5ef6edf59f8ab600660..b3625c792ca52c5a7666d3921e9bab1c26cf9d69 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -597,6 +597,7 @@ void Mod_LoadTexinfo (lump_t *l)
                {
                        out->texture = r_notexture_mip; // checkerboard texture
                        out->flags = 0;
+                       out->texture->transparent = FALSE;
                }
                else
                {
@@ -607,9 +608,8 @@ void Mod_LoadTexinfo (lump_t *l)
                        {
                                out->texture = r_notexture_mip; // texture not found
                                out->flags = 0;
-                       }
-                       else
                                out->texture->transparent = FALSE;
+                       }
                }
        }
 }