From b2313e32755a3e5e56fa7c657193d13aaf73761e Mon Sep 17 00:00:00 2001 From: Gabor Bata Date: Fri, 27 Oct 2023 16:38:49 +0200 Subject: [PATCH] Fix code formatting --- .gitattributes | 6 +----- DMUtils/src/dcolors.java | 2 +- src/automap/Map.java | 2 +- src/boom/E6Y.java | 2 +- src/data/Defines.java | 2 +- src/data/Tables.java | 2 +- src/data/doomdata.java | 2 +- src/data/doomtype.java | 2 +- src/data/dstrings.java | 2 +- src/data/info.java | 2 +- src/data/sounds.java | 2 +- src/doom/DoomMain.java | 2 +- src/doom/englsh.java | 2 +- src/doom/items.java | 2 +- src/doom/net.java | 2 +- src/f/EndLevel.java | 2 +- src/f/Finale.java | 2 +- src/g/DoomGameInterface.java | 2 +- src/g/Overflow.java | 2 +- src/hu/HU.java | 2 +- src/i/DoomSoundInterface.java | 2 +- src/i/DoomSystem.java | 2 +- src/i/SystemSoundInterface.java | 2 +- src/i/system.java | 2 +- src/m/DoomRandom.java | 2 +- src/m/IDoomMenu.java | 2 +- src/m/JavaRandom.java | 2 +- src/m/MenuMisc.java | 2 +- src/m/Swap.java | 2 +- src/m/cheatseq_t.java | 2 +- src/m/fixed_t.java | 2 +- src/n/BasicNetworkInterface.java | 2 +- src/n/DoomSystemNetworking.java | 2 +- src/p/BoomLevelLoader.java | 2 +- src/p/LevelLoader.java | 2 +- src/p/Specials.java | 2 +- src/s/IDoomSound.java | 2 +- src/s/ISoundDriver.java | 2 +- src/st/IDoomStatusBar.java | 2 +- src/st/StatusBar.java | 8 ++++---- src/w/WadLoader.java | 2 +- 41 files changed, 44 insertions(+), 48 deletions(-) diff --git a/.gitattributes b/.gitattributes index d44a9cf1..c757d818 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,3 @@ -*.c linguist-detectable=false -*.h linguist-detectable=false - DMUtils/* linguist-vendored=true demos/* linguist-vendored=true pwads/* linguist-vendored=true @@ -8,7 +5,6 @@ wads/* linguist-vendored=true *.png binary *.lmp binary -*.7z binary *.zip binary *.wad binary - +*.dat binary diff --git a/DMUtils/src/dcolors.java b/DMUtils/src/dcolors.java index cbbb45af..c6ed0b3f 100644 --- a/DMUtils/src/dcolors.java +++ b/DMUtils/src/dcolors.java @@ -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; diff --git a/src/automap/Map.java b/src/automap/Map.java index 02e3de59..f6adc297 100644 --- a/src/automap/Map.java +++ b/src/automap/Map.java @@ -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 $ diff --git a/src/boom/E6Y.java b/src/boom/E6Y.java index 57e1e519..5373182d 100644 --- a/src/boom/E6Y.java +++ b/src/boom/E6Y.java @@ -1,6 +1,6 @@ package boom; -/* Emacs style mode select -*- C++ -*- +/* Emacs style mode select -*- Java -*- *----------------------------------------------------------------------------- * * diff --git a/src/data/Defines.java b/src/data/Defines.java index 2c6c262e..1a41762c 100644 --- a/src/data/Defines.java +++ b/src/data/Defines.java @@ -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 $ diff --git a/src/data/Tables.java b/src/data/Tables.java index aeddf865..826f9284 100644 --- a/src/data/Tables.java +++ b/src/data/Tables.java @@ -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 $ diff --git a/src/data/doomdata.java b/src/data/doomdata.java index 110e6dd2..f791c803 100644 --- a/src/data/doomdata.java +++ b/src/data/doomdata.java @@ -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 $ diff --git a/src/data/doomtype.java b/src/data/doomtype.java index ef4f1b3d..68d2f99b 100644 --- a/src/data/doomtype.java +++ b/src/data/doomtype.java @@ -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 $ diff --git a/src/data/dstrings.java b/src/data/dstrings.java index b0d537b7..eceed898 100644 --- a/src/data/dstrings.java +++ b/src/data/dstrings.java @@ -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 $ diff --git a/src/data/info.java b/src/data/info.java index 26901d3d..4d1eea0b 100644 --- a/src/data/info.java +++ b/src/data/info.java @@ -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 $ diff --git a/src/data/sounds.java b/src/data/sounds.java index c32e28c3..20406c37 100644 --- a/src/data/sounds.java +++ b/src/data/sounds.java @@ -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 $ diff --git a/src/doom/DoomMain.java b/src/doom/DoomMain.java index 55c0fb77..68ab1725 100644 --- a/src/doom/DoomMain.java +++ b/src/doom/DoomMain.java @@ -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 $ diff --git a/src/doom/englsh.java b/src/doom/englsh.java index 7ff166b6..a2d4efa9 100644 --- a/src/doom/englsh.java +++ b/src/doom/englsh.java @@ -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 $ diff --git a/src/doom/items.java b/src/doom/items.java index a890d160..c90fa235 100644 --- a/src/doom/items.java +++ b/src/doom/items.java @@ -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 $ diff --git a/src/doom/net.java b/src/doom/net.java index b28b6537..0cf8590c 100644 --- a/src/doom/net.java +++ b/src/doom/net.java @@ -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 $ diff --git a/src/f/EndLevel.java b/src/f/EndLevel.java index 17d724c1..109b49a0 100644 --- a/src/f/EndLevel.java +++ b/src/f/EndLevel.java @@ -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 $ diff --git a/src/f/Finale.java b/src/f/Finale.java index 53872b94..cc84aae9 100644 --- a/src/f/Finale.java +++ b/src/f/Finale.java @@ -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 $ diff --git a/src/g/DoomGameInterface.java b/src/g/DoomGameInterface.java index 783bd5df..ae7d8010 100644 --- a/src/g/DoomGameInterface.java +++ b/src/g/DoomGameInterface.java @@ -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 $ diff --git a/src/g/Overflow.java b/src/g/Overflow.java index 160ff87a..452425e0 100644 --- a/src/g/Overflow.java +++ b/src/g/Overflow.java @@ -2,7 +2,7 @@ import rr.line_t; -/* Emacs style mode select -*- C++ -*- +/* Emacs style mode select -*- Java -*- *----------------------------------------------------------------------------- * * diff --git a/src/hu/HU.java b/src/hu/HU.java index fc09e5b3..fc0dce05 100644 --- a/src/hu/HU.java +++ b/src/hu/HU.java @@ -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 $ diff --git a/src/i/DoomSoundInterface.java b/src/i/DoomSoundInterface.java index af4036ee..92313ef0 100644 --- a/src/i/DoomSoundInterface.java +++ b/src/i/DoomSoundInterface.java @@ -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 $ diff --git a/src/i/DoomSystem.java b/src/i/DoomSystem.java index 5bcff3ab..dd01dd11 100644 --- a/src/i/DoomSystem.java +++ b/src/i/DoomSystem.java @@ -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 $ diff --git a/src/i/SystemSoundInterface.java b/src/i/SystemSoundInterface.java index 72f54ba5..fee94f13 100644 --- a/src/i/SystemSoundInterface.java +++ b/src/i/SystemSoundInterface.java @@ -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 $ diff --git a/src/i/system.java b/src/i/system.java index 98d2e113..caa733dc 100644 --- a/src/i/system.java +++ b/src/i/system.java @@ -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 $ diff --git a/src/m/DoomRandom.java b/src/m/DoomRandom.java index bdadbba5..b01472d4 100644 --- a/src/m/DoomRandom.java +++ b/src/m/DoomRandom.java @@ -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 $ diff --git a/src/m/IDoomMenu.java b/src/m/IDoomMenu.java index e35b76ad..5eaec578 100644 --- a/src/m/IDoomMenu.java +++ b/src/m/IDoomMenu.java @@ -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 $ diff --git a/src/m/JavaRandom.java b/src/m/JavaRandom.java index 1cc1b179..7bb9d634 100644 --- a/src/m/JavaRandom.java +++ b/src/m/JavaRandom.java @@ -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 $ diff --git a/src/m/MenuMisc.java b/src/m/MenuMisc.java index 236cb662..d8e5c0b4 100644 --- a/src/m/MenuMisc.java +++ b/src/m/MenuMisc.java @@ -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 $ diff --git a/src/m/Swap.java b/src/m/Swap.java index d1eddbce..566b4e2c 100644 --- a/src/m/Swap.java +++ b/src/m/Swap.java @@ -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 $ diff --git a/src/m/cheatseq_t.java b/src/m/cheatseq_t.java index dd2ae567..cdac87fb 100644 --- a/src/m/cheatseq_t.java +++ b/src/m/cheatseq_t.java @@ -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 $ diff --git a/src/m/fixed_t.java b/src/m/fixed_t.java index 02aa551e..a5ebb621 100644 --- a/src/m/fixed_t.java +++ b/src/m/fixed_t.java @@ -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 $ diff --git a/src/n/BasicNetworkInterface.java b/src/n/BasicNetworkInterface.java index 69c09517..4d523830 100644 --- a/src/n/BasicNetworkInterface.java +++ b/src/n/BasicNetworkInterface.java @@ -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 $ diff --git a/src/n/DoomSystemNetworking.java b/src/n/DoomSystemNetworking.java index 83c67b8b..ecad0edd 100644 --- a/src/n/DoomSystemNetworking.java +++ b/src/n/DoomSystemNetworking.java @@ -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 $ diff --git a/src/p/BoomLevelLoader.java b/src/p/BoomLevelLoader.java index b353d3b0..64666f0d 100644 --- a/src/p/BoomLevelLoader.java +++ b/src/p/BoomLevelLoader.java @@ -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 diff --git a/src/p/LevelLoader.java b/src/p/LevelLoader.java index 9564d3d3..c2faa304 100644 --- a/src/p/LevelLoader.java +++ b/src/p/LevelLoader.java @@ -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 $ diff --git a/src/p/Specials.java b/src/p/Specials.java index bf20491a..08d956db 100644 --- a/src/p/Specials.java +++ b/src/p/Specials.java @@ -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 $ diff --git a/src/s/IDoomSound.java b/src/s/IDoomSound.java index 69669464..33320b1b 100644 --- a/src/s/IDoomSound.java +++ b/src/s/IDoomSound.java @@ -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 $ diff --git a/src/s/ISoundDriver.java b/src/s/ISoundDriver.java index 2409c49a..d68a71bf 100644 --- a/src/s/ISoundDriver.java +++ b/src/s/ISoundDriver.java @@ -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 $ diff --git a/src/st/IDoomStatusBar.java b/src/st/IDoomStatusBar.java index 0d8e7c6d..c3a05a58 100644 --- a/src/st/IDoomStatusBar.java +++ b/src/st/IDoomStatusBar.java @@ -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 $ diff --git a/src/st/StatusBar.java b/src/st/StatusBar.java index 8c7f0c7b..8437f375 100644 --- a/src/st/StatusBar.java +++ b/src/st/StatusBar.java @@ -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 $ @@ -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()); @@ -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()); diff --git a/src/w/WadLoader.java b/src/w/WadLoader.java index 256231f0..260fb69e 100644 --- a/src/w/WadLoader.java +++ b/src/w/WadLoader.java @@ -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 $