ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70 from ItsStev/bug-fixes

Browse Source 
Bug fixes
This commit is contained in:
Lorenc Pekaj 2019-08-25 20:48:38 +10:00 committed by GitHub
commit 5f61728d43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gamemodes/irresistible/cnr/features/gangs/gvehicles.pwn
View File

@ -677,16 +677,16 @@ static stock GangVehicles_ShowSpawnList( playerid, gangid ) {
new new
current_time = GetServerTime( ); current_time = GetServerTime( );
szBigString = ""COL_WHITE"Vehicle\t"COL_WHITE"Availablity\n"; szLargeString = ""COL_WHITE"Vehicle\t"COL_WHITE"Availablity\n";
foreach ( new slotid : gangvehicles[ gangid ] ) foreach ( new slotid : gangvehicles[ gangid ] )
{ {
format( szBigString, sizeof( szBigString ), "%s%s\t%s\n", szBigString, format( szLargeString, sizeof( szLargeString ), "%s%s\t%s\n", szLargeString,
GetVehicleName( g_gangVehicleData[ gangid ] [ slotid ] [ E_MODEL ] ), GetVehicleName( g_gangVehicleData[ gangid ] [ slotid ] [ E_MODEL ] ),
g_gangVehicleData[ gangid ] [ slotid ] [ E_ACTIVATION_TIME ] > current_time ? ( secondstotime( g_gangVehicleData[ gangid ] [ slotid ] [ E_ACTIVATION_TIME ] - current_time ) ) : ( COL_GREEN # "Available" ) g_gangVehicleData[ gangid ] [ slotid ] [ E_ACTIVATION_TIME ] > current_time ? ( secondstotime( g_gangVehicleData[ gangid ] [ slotid ] [ E_ACTIVATION_TIME ] - current_time ) ) : ( COL_GREEN # "Available" )
); );
} }
return ShowPlayerDialog( playerid, DIALOG_GANG_VEHICLE_SPAWN, DIALOG_STYLE_TABLIST_HEADERS, ""COL_WHITE"Gang Vehicles - Spawn", szBigString, "Select", "Close" ); return ShowPlayerDialog( playerid, DIALOG_GANG_VEHICLE_SPAWN, DIALOG_STYLE_TABLIST_HEADERS, ""COL_WHITE"Gang Vehicles - Spawn", szLargeString, "Select", "Close" );
} }
/* ** Migrations ** */ /* ** Migrations ** */
/* /*

3
gamemodes/irresistible/cnr/features/houses/furniture.pwn
View File

@ -399,6 +399,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
DestroyDynamicObject( objectid ); DestroyDynamicObject( objectid );
mysql_single_query( sprintf( "DELETE FROM `FURNITURE` WHERE `ID`=%d AND `HOUSE_ID`=%d", editing_furniture, editing_house ) ); mysql_single_query( sprintf( "DELETE FROM `FURNITURE` WHERE `ID`=%d AND `HOUSE_ID`=%d", editing_furniture, editing_house ) );
Iter_Remove( housefurniture[ houseid ], i );
new iNetProfit = floatround( g_houseFurniture[ i ] [ E_COST ] / 2 ); new iNetProfit = floatround( g_houseFurniture[ i ] [ E_COST ] / 2 );
@ -496,7 +497,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
GivePlayerCash( playerid, -g_houseFurniture[ i ] [ E_COST ] ); GivePlayerCash( playerid, -g_houseFurniture[ i ] [ E_COST ] );
Streamer_Update( playerid ); // SyncObject( playerid ); Streamer_Update( playerid ); // SyncObject( playerid );
SendServerMessage( playerid, "You have purchased a "COL_GREY"%s"COL_WHITE". "COL_ORANGE"[%d/%d]", g_houseFurniture[ i ] [ E_NAME ], total_furniture + 1, vip_slots ); SendServerMessage( playerid, "You have purchased a "COL_GREY"%s"COL_WHITE". "COL_ORANGE"[%d/%d]", g_houseFurniture[ i ] [ E_NAME ], total_furniture, vip_slots );
ShowFurnitureList( playerid, p_FurnitureCategory{ playerid } ); ShowFurnitureList( playerid, p_FurnitureCategory{ playerid } );
break; break;
} }

2
gamemodes/sf-cnr.pwn
View File

@ -1107,7 +1107,7 @@ public OnPlayerTakePlayerDamage( playerid, issuerid, &Float: amount, weaponid, b
return 0; return 0;
// Anti RDM and gang member damage // Anti RDM and gang member damage
if ( ! IsPlayerInPaintBall( playerid ) && ! IsPlayerBoxing( playerid ) && ! IsPlayerDueling( playerid ) && ! IsPlayerInBattleRoyale( playerid ) ) if ( ! IsPlayerInPaintBall( playerid ) && ! IsPlayerBoxing( playerid ) && ! IsPlayerDueling( playerid ) && ! IsPlayerInBattleRoyale( playerid ) && ! IsPlayerInEvent( playerid ) )
{ {
#if defined __cloudy_event_system #if defined __cloudy_event_system
if ( IsPlayerInPlayerGang( issuerid, playerid ) && ! ( IsPlayerInEvent( playerid ) && IsPlayerInEvent( issuerid ) && g_eventData[ EV_FIGHT_TYPE] <= 2 ) ) if ( IsPlayerInPlayerGang( issuerid, playerid ) && ! ( IsPlayerInEvent( playerid ) && IsPlayerInEvent( issuerid ) && g_eventData[ EV_FIGHT_TYPE] <= 2 ) )