Merge commit '48410b113dd2036e69dbf723a39ec9af02fc9b12'

[xonotic/netradiant.git] / plugins / spritemodel / spritemodel.cpp

diff --git a/plugins/spritemodel/spritemodel.cpp b/plugins/spritemodel/spritemodel.cpp
index 411f377dc15fef5652314ed0ce2ebddbf986815b..a936cd3b8bd24abe0f994f6817d451ec58b996ed 100644 (file)
--- a/plugins/spritemodel/spritemodel.cpp
+++ b/plugins/spritemodel/spritemodel.cpp
@@ -1,6 +1,5 @@
 /*
-Copyright (C) 1999-2007 id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+Copyright (C) 2002 Dominic Clifton.
 
 This file is part of GtkRadiant.
 
@@ -38,7 +37,7 @@ void LoadSpriteModel(entity_interfaces_t *interfaces, const char *name)
   if (!pShader)
   {
     Sys_Printf("ERROR: can't find shader (or image) for: %s\n", name );
-    return;
+    return;// NULL;
   }
 
   CSpriteModel *model = new CSpriteModel();
@@ -141,14 +140,14 @@ void CSpriteModel::Draw(int state, int rflags) const
 
   // so draw it using y/z instead.
   g_QglTable.m_pfn_qglBegin(GL_QUADS);
-  g_QglTable.m_pfn_qglTexCoord2f (0,0);
-  g_QglTable.m_pfn_qglVertex3f (0,w,h);
-  g_QglTable.m_pfn_qglTexCoord2f (1,0);
-  g_QglTable.m_pfn_qglVertex3f (0,0-w,h);
-  g_QglTable.m_pfn_qglTexCoord2f (1,1);
-  g_QglTable.m_pfn_qglVertex3f (0,0-w,0-h);
-  g_QglTable.m_pfn_qglTexCoord2f (0,1);
-  g_QglTable.m_pfn_qglVertex3f (0,w,0-h);
+  g_QglTable.m_pfn_qglTexCoord2f(0.0f, 0.0f);
+  g_QglTable.m_pfn_qglVertex3f(0.0f, static_cast<float>(w), static_cast<float>(h));
+  g_QglTable.m_pfn_qglTexCoord2f(1.0f, 0.0f);
+  g_QglTable.m_pfn_qglVertex3f(0.0f, 0.0f - static_cast<float>(w), static_cast<float>(h));
+  g_QglTable.m_pfn_qglTexCoord2f(1.0f, 1.0f);
+  g_QglTable.m_pfn_qglVertex3f(0.0f, 0.0f - static_cast<float>(w), 0.0f - static_cast<float>(h));
+  g_QglTable.m_pfn_qglTexCoord2f(0.0f, 0.0f);
+  g_QglTable.m_pfn_qglVertex3f(0.0f, static_cast<float>(w), 0.0f - static_cast<float>(h));
   g_QglTable.m_pfn_qglEnd ();
 #endif