mirror of
				https://github.com/KartKrewDev/RingRacers.git
				synced 2025-10-30 08:01:28 +00:00 
			
		
		
		
	Merge branch 'encore-demap' into 'master'
More encore/tweak remapping limits Closes #1520 and #1284 See merge request kart-krew-dev/ring-racers-internal!2954
This commit is contained in:
		
						commit
						19600c2589
					
				
					 1 changed files with 35 additions and 35 deletions
				
			
		
							
								
								
									
										70
									
								
								src/info.c
									
										
									
									
									
								
							
							
						
						
									
										70
									
								
								src/info.c
									
										
									
									
									
								
							|  | @ -13780,7 +13780,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -13807,7 +13807,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -13915,7 +13915,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -13942,7 +13942,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -13969,7 +13969,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -13996,7 +13996,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14023,7 +14023,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14050,7 +14050,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14077,7 +14077,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14104,7 +14104,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14131,7 +14131,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14158,7 +14158,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14185,7 +14185,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14212,7 +14212,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14239,7 +14239,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -14266,7 +14266,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		100,            // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -17561,7 +17561,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_SPECIAL, // flags
 | ||||
| 		MF_NOGRAVITY|MF_SPECIAL|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -17588,7 +17588,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_SPECIAL, // flags
 | ||||
| 		MF_NOGRAVITY|MF_SPECIAL|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -17615,7 +17615,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,           // mass
 | ||||
| 		0,           // damage
 | ||||
| 		sfx_supert,  // activesound
 | ||||
| 		MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags
 | ||||
| 		MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL       // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -17642,7 +17642,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,           // mass
 | ||||
| 		0,           // damage
 | ||||
| 		sfx_None,    // activesound
 | ||||
| 		MF_NOCLIPHEIGHT|MF_SPECIAL|MF_NOGRAVITY, // flags
 | ||||
| 		MF_NOCLIPHEIGHT|MF_SPECIAL|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL       // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -17669,7 +17669,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,           // mass
 | ||||
| 		0,           // damage
 | ||||
| 		sfx_None,    // activesound
 | ||||
| 		MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags
 | ||||
| 		MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL       // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -17858,7 +17858,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SPECIAL|MF_SHOOTABLE, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SPECIAL|MF_SHOOTABLE|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19020,7 +19020,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 	    0,              // damage
 | ||||
| 	    sfx_None,       // activesound
 | ||||
| 
 | ||||
| 	    MF_NOCLIPTHING|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT, // flags
 | ||||
| 	    MF_NOCLIPTHING|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL,			// raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19048,7 +19048,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 	    0,              // damage
 | ||||
| 	    sfx_None,       // activesound
 | ||||
| 
 | ||||
| 	    MF_NOCLIPTHING|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT, // flags
 | ||||
| 	    MF_NOCLIPTHING|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL,			// raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19076,7 +19076,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 	    0,              // damage
 | ||||
| 	    sfx_None,       // activesound
 | ||||
| 
 | ||||
| 	    MF_NOCLIPTHING|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT, // flags
 | ||||
| 	    MF_NOCLIPTHING|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL,			// raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19481,7 +19481,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_DONTPUNT, // flags
 | ||||
| 		MF_SPECIAL|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_DONTPUNT|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19508,7 +19508,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
 | ||||
| 		MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19643,7 +19643,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
 | ||||
| 		MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19697,7 +19697,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_SCENERY, // flags
 | ||||
| 		MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -19724,7 +19724,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_SCENERY, // flags
 | ||||
| 		MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -20129,7 +20129,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_SPECIAL|MF_SHOOTABLE|MF_NOGRAVITY, // flags
 | ||||
| 		MF_SPECIAL|MF_SHOOTABLE|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -20156,7 +20156,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,              // mass
 | ||||
| 		0,              // damage
 | ||||
| 		sfx_None,       // activesound
 | ||||
| 		MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_SCENERY, // flags
 | ||||
| 		MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL          // raisestate
 | ||||
| 	}, | ||||
| 
 | ||||
|  | @ -22764,7 +22764,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,            // mass
 | ||||
| 		0,            // damage
 | ||||
| 		sfx_None,     // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP|MF_NOCLIPTHING, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP|MF_NOCLIPTHING|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL        // raisestate
 | ||||
| 	}, | ||||
| 	{           // MT_EXP
 | ||||
|  | @ -22790,7 +22790,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,            // mass
 | ||||
| 		0,            // damage
 | ||||
| 		sfx_None,     // activesound
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP|MF_NOCLIPTHING, // flags
 | ||||
| 		MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP|MF_NOCLIPTHING|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL        // raisestate
 | ||||
| 	}, | ||||
| 	{           // MT_FLYBOT767
 | ||||
|  | @ -22816,7 +22816,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = | |||
| 		0,            // mass
 | ||||
| 		0,            // damage
 | ||||
| 		sfx_None,     // activesound
 | ||||
| 		MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP|MF_NOCLIPTHING, // flags
 | ||||
| 		MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP|MF_NOCLIPTHING|MF_DONTENCOREMAP, // flags
 | ||||
| 		S_NULL        // raisestate
 | ||||
| 	}, | ||||
| 	{           // MT_STONESHOE
 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Eidolon
						Eidolon