Skip to content

Commit

Permalink
Fix code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborbata committed Oct 27, 2023
1 parent a53dfa7 commit b2313e3
Show file tree
Hide file tree
Showing 41 changed files with 44 additions and 48 deletions.
6 changes: 1 addition & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
*.c linguist-detectable=false
*.h linguist-detectable=false

DMUtils/* linguist-vendored=true
demos/* linguist-vendored=true
pwads/* linguist-vendored=true
wads/* linguist-vendored=true

*.png binary
*.lmp binary
*.7z binary
*.zip binary
*.wad binary

*.dat binary
2 changes: 1 addition & 1 deletion DMUtils/src/dcolors.java
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public static final short getRGBA4444(int red,int green,int blue){
static private void BuildSpecials ()
{
int c,gray;
float red, green, blue;;
float red, green, blue;
int palsrc;

palsrc = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/automap/Map.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package automap;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
// -----------------------------------------------------------------------------
//
// $Id: Map.java,v 1.37 2012/09/24 22:36:28 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/boom/E6Y.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package boom;

/* Emacs style mode select -*- C++ -*-
/* Emacs style mode select -*- Java -*-
*-----------------------------------------------------------------------------
*
*
Expand Down
2 changes: 1 addition & 1 deletion src/data/Defines.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import static m.fixed_t.FRACUNIT;
import static m.fixed_t.MAPFRACUNIT;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: Defines.java,v 1.48 2012/09/24 17:16:22 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/data/Tables.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static m.fixed_t.FRACBITS;
import static m.fixed_t.FRACUNIT;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: Tables.java,v 1.22 2011/05/06 09:21:59 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/data/doomdata.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package data;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: doomdata.java,v 1.4 2011/02/11 00:11:13 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/data/doomtype.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package data;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: doomtype.java,v 1.3 2011/02/11 00:11:13 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/data/dstrings.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package data;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: dstrings.java,v 1.4 2010/10/01 16:47:51 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/data/info.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import static p.MobjFlags.MF_SPAWNCEILING;
import static p.MobjFlags.MF_SPECIAL;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: info.java,v 1.13 2013/06/03 12:36:42 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/data/sounds.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package data;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: sounds.java,v 1.1 2010/06/30 08:58:51 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/doom/DoomMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
import w.IWadLoader;
import w.WadLoader;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: DoomMain.java,v 1.109 2012/11/06 16:04:58 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/doom/englsh.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package doom;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: englsh.java,v 1.5 2011/05/31 21:46:20 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/doom/items.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package doom;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: items.java,v 1.3 2010/12/20 17:15:08 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/doom/net.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package doom;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: net.java,v 1.5 2011/02/11 00:11:13 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/f/EndLevel.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package f;

/* Emacs style mode select -*- C++ -*-
/* Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: EndLevel.java,v 1.11 2012/09/24 17:16:23 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/f/Finale.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import v.renderers.DoomScreen;
import static v.renderers.DoomScreen.FG;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: Finale.java,v 1.28 2012/09/24 17:16:23 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/g/DoomGameInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import doom.event_t;
import doom.gameaction_t;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: DoomGameInterface.java,v 1.4 2010/12/20 17:15:08 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/g/Overflow.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import rr.line_t;

/* Emacs style mode select -*- C++ -*-
/* Emacs style mode select -*- Java -*-
*-----------------------------------------------------------------------------
*
*
Expand Down
2 changes: 1 addition & 1 deletion src/hu/HU.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hu;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
// -----------------------------------------------------------------------------
//
// $Id: HU.java,v 1.32 2012/09/24 17:16:23 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/i/DoomSoundInterface.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package i;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: DoomSoundInterface.java,v 1.3 2011/02/11 00:11:13 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/i/DoomSystem.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: DoomSystem.java,v 1.18 2013/06/04 11:29:39 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/i/SystemSoundInterface.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package i;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: SystemSoundInterface.java,v 1.2 2011/05/17 16:51:20 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/i/system.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: system.java,v 1.5 2011/02/11 00:11:13 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/m/DoomRandom.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import data.mobjtype_t;
import p.ActiveStates;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: DoomRandom.java,v 1.4 2013/06/04 11:29:25 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/m/IDoomMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import static doom.SourceCode.M_Menu.M_Ticker;
import doom.event_t;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
// -----------------------------------------------------------------------------
//
// $Id: IDoomMenu.java,v 1.5 2011/09/29 15:16:23 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/m/JavaRandom.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.Random;
import p.ActiveStates;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: JavaRandom.java,v 1.3 2013/06/03 11:00:03 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/m/MenuMisc.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import mochadoom.Loggers;
import w.IWritableDoomObject;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: MenuMisc.java,v 1.29 2012/09/24 17:16:22 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/m/Swap.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package m;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: Swap.java,v 1.2 2011/07/27 20:48:20 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/m/cheatseq_t.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package m;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
// -----------------------------------------------------------------------------
//
// $Id: cheatseq_t.java,v 1.8 2011/11/01 23:47:50 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/m/fixed_t.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package m;

import data.Defines;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: fixed_t.java,v 1.14 2011/10/25 19:52:13 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/n/BasicNetworkInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import mochadoom.Loggers;
import w.DoomBuffer;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: BasicNetworkInterface.java,v 1.5 2011/05/26 13:39:06 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/n/DoomSystemNetworking.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package n;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: DoomSystemNetworking.java,v 1.1 2010/11/17 23:55:06 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/p/BoomLevelLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
import w.wadfile_info_t;

/*
* Emacs style mode select -*- C++ -*-
* Emacs style mode select -*- Java -*-
* -----------------------------------------------------------------------------
* PrBoom: a Doom port merged with LxDoom and LSDLDoom based on BOOM, a modified
* and improved DOOM engine Copyright (C) 1999 by id Software, Chi Hoang, Lee
Expand Down
2 changes: 1 addition & 1 deletion src/p/LevelLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import static utils.GenericCopy.malloc;
import w.DoomBuffer;

//Emacs style mode select -*- C++ -*-
//Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: LevelLoader.java,v 1.44 2012/09/24 17:16:23 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/p/Specials.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import rr.sector_t;
import rr.side_t;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: Specials.java,v 1.7 2011/06/01 00:09:08 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/s/IDoomSound.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import doom.DoomMain;
import p.mobj_t;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: IDoomSound.java,v 1.5 2011/08/24 15:55:12 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/s/ISoundDriver.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.logging.Logger;
import mochadoom.Loggers;

//Emacs style mode select -*- C++ -*-
//Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: ISoundDriver.java,v 1.1 2012/11/08 17:12:42 velktron Exp $
Expand Down
2 changes: 1 addition & 1 deletion src/st/IDoomStatusBar.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package st;
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
//-----------------------------------------------------------------------------
//
// $Id: IDoomStatusBar.java,v 1.4 2012/09/24 17:16:23 velktron Exp $
Expand Down
8 changes: 4 additions & 4 deletions src/st/StatusBar.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package st;

// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
// -----------------------------------------------------------------------------
//
// $Id: StatusBar.java,v 1.47 2011/11/01 23:46:37 velktron Exp $
Expand Down Expand Up @@ -574,8 +574,8 @@ public StatusBar(DoomMain<?, ?> DOOM) {
ST_ARMSY = (int) (172 * DOOM.vs.getSafeScaling());
ST_ARMSBGX = (int) (104 * DOOM.vs.getSafeScaling());
ST_ARMSBGY = (int) (168 * DOOM.vs.getSafeScaling());
ST_ARMSXSPACE = 12 * DOOM.vs.getSafeScaling();;
ST_ARMSYSPACE = 10 * DOOM.vs.getSafeScaling();;
ST_ARMSXSPACE = 12 * DOOM.vs.getSafeScaling();
ST_ARMSYSPACE = 10 * DOOM.vs.getSafeScaling();

// Frags pos.
ST_FRAGSX = (int) (138 * DOOM.vs.getSafeScaling());
Expand All @@ -588,7 +588,7 @@ public StatusBar(DoomMain<?, ?> DOOM) {
ST_ARMORY = (int) (171 * DOOM.vs.getSafeScaling());

// Key icon positions.
ST_KEY0WIDTH = 8 * DOOM.vs.getSafeScaling();;
ST_KEY0WIDTH = 8 * DOOM.vs.getSafeScaling();
ST_KEY0HEIGHT = 5 * DOOM.vs.getSafeScaling();

ST_KEY0X = (int) (239 * DOOM.vs.getSafeScaling());
Expand Down
2 changes: 1 addition & 1 deletion src/w/WadLoader.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Emacs style mode select -*- C++ -*-
// Emacs style mode select -*- Java -*-
// -----------------------------------------------------------------------------
//
// $Id: WadLoader.java,v 1.64 2014/03/28 00:55:32 velktron Exp $
Expand Down

0 comments on commit b2313e3

Please sign in to comment.