From 94774c7fd1a46c5ab8f93060f84b06ce70278099 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 22 Nov 2017 15:38:54 -0600 Subject: [PATCH 1/2] Delete Overview.c~ --- Source/Client/Overview.c~ | 172 -------------------------------------- 1 file changed, 172 deletions(-) delete mode 100755 Source/Client/Overview.c~ diff --git a/Source/Client/Overview.c~ b/Source/Client/Overview.c~ deleted file mode 100755 index 9d6cbf5d..00000000 --- a/Source/Client/Overview.c~ +++ /dev/null @@ -1,172 +0,0 @@ -/* -FreeCS Project -Copyright (C) 2016, 2017 Marco "eukara" Hladik - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* -The overview system was meant to support -more layers and so on. Never actually used. -Probably seemed impractical, feel free to make this -parse layers etc. properly though. -*/ - -typedef struct { - float fZoom; - vector vOrigin; - int iRotated; - float fHeight; - string sImagePath; - float fCameraHeight; - vector vVert1; - vector vVert2; - vector vVert3; - vector vVert4; -} overview_t; - -overview_t ovMap; - -/* -================= -Overview_Init - -Initializes the globals and whatnot -================= -*/ -void Overview_Init( void ) { - int *iImageSrc; - int iImageWidth = 0; - int iImageHeight = 0; - int iImageCount = 0; - string sTemp; - - ovMap.fZoom = 1.0f; - ovMap.vOrigin = '0 0 0'; - ovMap.iRotated = FALSE; - - filestream fOverview = fopen( sprintf( "overviews/%s.txt", mapname ), FILE_READ ); - if ( fOverview != -1 ) { - for ( int i = 0;; i++ ) { - sTemp = fgets( fOverview ); - if not ( sTemp ) { - break; - } - - tokenize( sTemp ); - if ( strtolower( argv( 0 ) ) == "zoom" ) { - ovMap.fZoom = stof( argv( 1 ) ); - } else if ( strtolower( argv( 0 ) ) == "origin" ) { - ovMap.vOrigin = [ stof( argv( 1 ) ), stof( argv( 2 ) ), stof( argv( 3 ) ) ]; - } else if ( strtolower( argv( 0 ) ) == "rotated" ) { - ovMap.iRotated = (int)stof( argv( 1 ) ); - } else if ( strtolower( argv( 0 ) ) == "height" ) { - ovMap.fHeight = stof( argv( 1 ) ); - } - } - fclose( fOverview ); - } else { - print( sprintf( "[OVERVIEW] Couldn't load overviews/%s.txt\n", mapname ) ); - ovMap.sImagePath = __NULL__; - return; - } - - if ( ovMap.iRotated == TRUE ) { - ovMap.vVert1 = ovMap.vOrigin -( ( 4096/ovMap.fZoom ) * '1 0.75 0' ); - ovMap.vVert4 = ovMap.vOrigin + ( 4096/ovMap.fZoom ) * '1 0.75 0'; - ovMap.vVert2 = [ ovMap.vVert1[0], ovMap.vVert4[1] ] ; - ovMap.vVert3 = [ ovMap.vVert4[0], ovMap.vVert1[1] ] ; - } else { - ovMap.vVert1 = ovMap.vOrigin -( ( 4096/ovMap.fZoom ) * '0.75 1 0' ); - ovMap.vVert4 = ovMap.vOrigin + ( 4096/ovMap.fZoom ) * '0.75 1 0'; - ovMap.vVert2 = [ ovMap.vVert1[0], ovMap.vVert4[1] ] ; - ovMap.vVert3 = [ ovMap.vVert4[0], ovMap.vVert1[1] ] ; - } - - ovMap.fCameraHeight = fabs( 4096/ovMap.fZoom ); - - ovMap.sImagePath = "overview"; - shaderforname( ovMap.sImagePath, sprintf("{\n{\nprogram default2d\nmap $rt:%s\n}\n}\n", ovMap.sImagePath ) ); - - // Read the image and get rid of the burning green - iImageSrc = r_readimage( sprintf( "overviews/%s.bmp", mapname ), iImageWidth, iImageHeight ); - if ( iImageSrc != __NULL__ ) { - for ( int i = 0; i < ( iImageWidth * iImageHeight ); i++ ) { - if ( iImageSrc[ i ] == 0xff00ff00i ) { - iImageSrc[ i ] = 0x00000000i; - } - } - r_uploadimage( ovMap.sImagePath, iImageWidth, iImageHeight, iImageSrc ); - memfree( iImageSrc ); - } -} - -void Overview_DrawLayer( void ) { - if ( ovMap.iRotated == TRUE ) { - R_BeginPolygon( ovMap.sImagePath ); - R_PolygonVertex( [ ovMap.vVert4[0], ovMap.vVert4[1], ovMap.fHeight ], '1 0', '1 1 1', 1.0f ); // Top Left - R_PolygonVertex( [ ovMap.vVert3[0], ovMap.vVert3[1], ovMap.fHeight ], '1 1', '1 1 1', 1.0f ); // Top Right - R_PolygonVertex( [ ovMap.vVert1[0], ovMap.vVert1[1], ovMap.fHeight ], '0 1', '1 1 1', 1.0f ); // Bottom right - R_PolygonVertex( [ ovMap.vVert2[0], ovMap.vVert2[1], ovMap.fHeight ], '0 0', '1 1 1', 1.0f ); // Bottom left - R_EndPolygon(); - } else { - R_BeginPolygon( ovMap.sImagePath ); - R_PolygonVertex( [ ovMap.vVert4[0], ovMap.vVert4[1], ovMap.fHeight ], '0 0', '1 1 1', 1.0f ); // Top Left - R_PolygonVertex( [ ovMap.vVert3[0], ovMap.vVert3[1], ovMap.fHeight ], '1 0', '1 1 1', 1.0f ); // Top Right - R_PolygonVertex( [ ovMap.vVert1[0], ovMap.vVert1[1], ovMap.fHeight ], '1 1', '1 1 1', 1.0f ); // Bottom right - R_PolygonVertex( [ ovMap.vVert2[0], ovMap.vVert2[1], ovMap.fHeight ], '0 1', '1 1 1', 1.0f ); // Bottom left - R_EndPolygon(); - } - - for ( entity eFind = world; ( eFind = find( eFind, classname, "player" ) ); ) { - if ( getplayerkeyvalue( eFind.entnum - 1, "*team" ) == "1" ) { - R_BeginPolygon( "sprites/iplayerred.spr_0.tga" ); - } else { - if ( getplayerkeyvalue( eFind.entnum - 1, "*dead" ) == "2" ) { - R_BeginPolygon( "sprites/iplayervip.spr_0.tga" ); - } else { - R_BeginPolygon( "sprites/iplayerblue.spr_0.tga" ); - } - } - R_PolygonVertex( [ eFind.absmax_x + 16, eFind.absmin_y - 16, ovMap.fHeight + 16 ], '1 0', '1 1 1', 1.0f ); // Top Right - R_PolygonVertex( [ eFind.absmin_x - 16, eFind.absmin_y - 16, ovMap.fHeight + 16 ], '0 0', '1 1 1', 1.0f ); // Top left - R_PolygonVertex( [ eFind.absmin_x - 16, eFind.absmax_y + 16, ovMap.fHeight + 16 ], '0 1', '1 1 1', 1.0f ); // Bottom left - R_PolygonVertex( [ eFind.absmax_x + 16, eFind.absmax_y + 16, ovMap.fHeight + 16 ], '1 1', '1 1 1', 1.0f ); // Bottom right - R_EndPolygon(); - } - -} - -/* -================= -Overview_Draw - -Draw one of two types of overviews. -This is for spectators. -================= -*/ -void Overview_Draw( void ) { - if ( ovMap.sImagePath == __NULL__ ) { - return; - } - - drawfill( vVideoMins, vVideoResolution, '0 0 0', 1.0f, 0 ); - - Overview_DrawLayer(); - - makevectors( view_angles ); - setproperty( VF_ORIGIN, ovMap.vOrigin + ( v_forward * -ovMap.fCameraHeight ) ) ; -} \ No newline at end of file From c320b6ae4e509cc23acdcaeae561830e0639bb82 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 22 Nov 2017 15:39:12 -0600 Subject: [PATCH 2/2] Delete csprogs.lno --- freecs/csprogs.lno | Bin 23988 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 freecs/csprogs.lno diff --git a/freecs/csprogs.lno b/freecs/csprogs.lno deleted file mode 100755 index 044e02cf17431dfa24db4c674800104be2d41423..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23988 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 SMRcGnozNL}uI)!Y0{;mQ9;+Gv