Merge branch 'develop' into feat/command-priority

Author: pavanvo

.github/workflows/cmake.yml

@@ -1,4 +1,7 @@
 name: CMake
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
 
 on:
   push:
@@ -12,49 +15,46 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x64]
-        os: [ubuntu-18.04, ubuntu-latest]
+        os: [ubuntu-20.04, ubuntu-22.04]
         compiler: [gcc, clang]
     runs-on: ${{ matrix.os }}
-
+    env:
+      MATRIX_COMPILER: ${{matrix.compiler}}
+      MATRIX_OS: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v2
-
+    - uses: actions/checkout@v3
     - name: Get dependencies
       run: |
-        sudo apt update
+        sudo apt-get update && sudo apt-get upgrade
         sudo mk/linux/setupBuildDeps.sh
-    
-    - name: Bulid MegaGlest With GCC Compiler
-      if: ${{ matrix.compiler == 'gcc' }}
-      env:
-        CC: gcc
-        CXX: g++
-      run: mk/linux/build-mg.sh
+    - name: Build
+      run:  |
+        if [ "${MATRIX_COMPILER}" = "clang" ]; then
+          EXTRA_OPTS="-f"
+        fi
+        mk/linux/build-mg.sh -m -d ${EXTRA_OPTS}
+        make -C mk/linux/build -j$(nproc) VERBOSE=1
 
-    - name: Bulid MegaGlest With Clang Compiler
-      if: ${{ matrix.compiler == 'clang' }}
-      env:
-        CC: clang
-        CXX: clang++
-      run: mk/linux/build-mg.sh
-
-    - name: Prepare Snapshot
-      if: ${{ matrix.compiler == 'gcc' && matrix.os == 'ubuntu-latest' }}
+  build-linux-other:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [10, 12] # 11 is on 22.04 by default, tested above
+    runs-on: ubuntu-22.04
+    env:
+      CC: gcc-${{matrix.compiler}}
+      CXX: g++-${{matrix.compiler}}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Get dependencies
       run: |
-        cp mk/shared/*.ini mk/linux/
-        strip -g mk/linux/megaglest mk/linux/megaglest_editor mk/linux/megaglest_g3dviewer
-      
-    - name: Create Mega Glest Snapshot
-      if: ${{ matrix.compiler == 'gcc' && matrix.os == 'ubuntu-latest' }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: megaglest-${{ matrix.arch }}-${{ matrix.os }}-${{ matrix.compiler }}
-        path: |
-          mk/linux/megaglest
-          mk/linux/megaglest_editor
-          mk/linux/megaglest_g3dviewer
-          mk/linux/*.ini
-          !mk/linux/glest-dev.ini
+        sudo apt-get update && sudo apt-get upgrade
+        sudo apt-get install -y $CXX
+        sudo mk/linux/setupBuildDeps.sh
+    - name: Build
+      run:  |
+        mk/linux/build-mg.sh -d -m
+        make -C mk/linux/build -j$(nproc) VERBOSE=1
 
   build-win64:
     # The CMake configure and build commands are platform agnostic and should work equally
@@ -72,16 +72,16 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
-    
+    - uses: actions/checkout@v3
+
     - name: Cache Vcpkg Libs
       uses: actions/cache@v2
       env:
         cache-name: cache-vcpkg-deps
       with:
         path: c:/vcpkg/installed
         key: vcpkg-deps
-    
+
     - name: Install Dependencies
       run: |
         vcpkg integrate install
@@ -121,15 +121,15 @@ jobs:
     - name: Build Mega Glest
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config Release --target ALL_BUILD
-    
+
     - name: Prepare Snapshot
       run: |
         cd mk/windoze
         cp ..\shared\*.ini .
         $7zPath = $(Get-Command 7z).Source
         cp $7zPath .
         cd ../..
-      
+
     - name: Create Mega Glest Snapshot
       uses: actions/upload-artifact@v2
       with:
@@ -154,7 +154,7 @@ jobs:
   #   - name: Get dependencies
   #     run: |
   #       brew install pkg-config cmake sdl2 lua jpeg libpng freetype ftgl libogg glew libvorbis cppunit fribidi miniupnpc curl wxmac xquartz zstd xml2 openldap
-    
+
   #   - name: Bulid MegaGlest With Clang Compiler
   #     if: ${{ matrix.compiler == 'clang' }}
   #     env:
@@ -166,6 +166,6 @@ jobs:
   #       mk/macos/build-mg.sh
    # - name: Test
    #   working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.  
+      # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
    #   run: ctest -C ${{env.BUILD_TYPE}}

.github/workflows/snapshot.yml

@@ -0,0 +1,39 @@
+name: Make Snapshot
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
+on:
+  push:
+    branches: [ develop ]
+
+# The artifact only runs on the same distro that it was built on.
+# TODO: make AppImage instead
+jobs:
+  make-snapshot:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Get dependencies
+      run: |
+        sudo apt-get update && sudo apt-get upgrade
+        sudo mk/linux/setupBuildDeps.sh
+    - name: Build
+      run:  |
+        mk/linux/build-mg.sh -m
+        make -C mk/linux/build -j$(nproc) VERBOSE=1
+    - name: Prepare Snapshot
+      run: |
+        cp mk/shared/*.ini mk/linux/
+        strip -g mk/linux/megaglest mk/linux/megaglest_editor mk/linux/megaglest_g3dviewer
+    - name: Create Mega Glest Snapshot
+      uses: actions/upload-artifact@v2
+      with:
+        name: megaglest-x64-ubuntu-20.04-gcc
+        path: |
+          mk/linux/megaglest
+          mk/linux/megaglest_editor
+          mk/linux/megaglest_g3dviewer
+          mk/linux/*.ini
+          !mk/linux/glest-dev.ini

mk/linux/setupBuildDeps.sh

@@ -159,13 +159,9 @@ case $distribution in
 				#name > zesty, EoL January 2018
 				installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev libidn2-dev libpsl-dev"
 				;;
-			18.04)
-				#name > bionic
-				installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn11-dev libgnutls28-dev libnghttp2-dev libssh2-1-dev libidn2-dev libpsl-dev"
-				;;
-			20.04)
-				#name > Focal Fossa
-				installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-gtk3-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh-dev libbrotli-dev"
+			"18.04"|"20.04"|"22.04")
+				#name > Bionic, Focal Fossa, Jammy Jellyfish
+				installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-gtk3-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh-dev libbrotli-dev"
 				;;
 			*)
 				installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
@@ -177,15 +173,15 @@ case $distribution in
 		case $release in
 			20.04)
 				#name > Focal Fossa
-				installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-gtk3-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libvlc-dev libvlccore-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh-dev libbrotli-dev"
+				installcommand="apt-get install $APT_OPTIONS build-essential cmake libcurl4-gnutls-dev libsdl2-dev libopenal-dev liblua5.3-dev libjpeg-dev libpng-dev libfreetype6-dev libwxgtk3.0-gtk3-dev libcppunit-dev libfribidi-dev libftgl-dev libglew-dev libogg-dev libvorbis-dev libminiupnpc-dev libircclient-dev libxml2-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev librtmp-dev libkrb5-dev libldap2-dev libidn2-dev libpsl-dev libgnutls28-dev libnghttp2-dev libssh-dev libbrotli-dev"
 				;;
 			*)
 				installcommand="apt-get install $APT_OPTIONS $packages_for_next_debian_ubuntu_mint"
 				unsupported_currently_this_OS="release"
 				;;
 		esac
 		;;
-    
+
 	LinuxMint|Linuxmint)
 		case $release in
 			2)

source/glest_game/gui/gui.cpp

@@ -705,13 +705,21 @@ void Gui::mouseDownDisplayUnitSkills(int posDisplay) {
 				else {
 					activeCommandType= NULL;
 					activeCommandClass= display.getCommandClass(posDisplay);
+					if (activeCommandClass  == ccAttack) {
+						unit= selection.getUnitFromCC(ccAttack);
+					}
+
 				}
 
 				//give orders depending on command type
 				if(!selection.isEmpty()){
 					const CommandType *ct= selection.getUnit(0)->getType()->getFirstCtOfClass(activeCommandClass);
 					auto mct= unit->getCurrMorphCt();
 					if(mct) ct= mct->getMorphUnit()->getFirstCtOfClass(activeCommandClass);
+					if (activeCommandClass  == ccAttack) {
+						ct = selection.getUnitFromCC(ccAttack)->getType()->getFirstCtOfClass(activeCommandClass);
+					}
+
 					if(activeCommandType!=NULL && activeCommandType->getClass()==ccBuild){
 						assert(selection.isUniform());
 						selectingBuilding= true;
@@ -844,8 +852,13 @@ void Gui::computeInfoString(int posDisplay){
 					const UnitType *ut= selection.getFrontUnit()->getType();
 					CommandClass cc= display.getCommandClass(posDisplay);
 					if(cc!=ccNull){
-						display.setInfoText(lang.getString("CommonCommand") + ": " + ut->getFirstCtOfClass(cc)->toString(true));
-					}
+						if (cc == ccAttack) {
+							const Unit* attackingUnit = selection.getUnitFromCC(ccAttack);
+							display.setInfoText(lang.getString("CommonCommand") + ": " + attackingUnit->getType()->getFirstCtOfClass(cc)->toString(true));
+						} else {
+							display.setInfoText(lang.getString("CommonCommand") + ": " + ut->getFirstCtOfClass(cc)->toString(true));
+						}
+                    }
 				}
 			}
 		}
@@ -1032,9 +1045,19 @@ void Gui::computeDisplay(){
 
 						//printf("computeDisplay i = %d cc = %d isshared = %d lastCommand = %d\n",i,cc,isSharedCommandClass(cc),lastCommand);
 
-						if(isSharedCommandClass(cc) && cc != ccBuild){
+						const Unit* attackingUnit = NULL;
+						if (cc == ccAttack) {
+							attackingUnit = selection.getUnitFromCC(ccAttack);
+						}
+
+						if((cc == ccAttack && attackingUnit != NULL) || (isSharedCommandClass(cc) && cc != ccBuild)){
 							display.setDownLighted(lastCommand, true);
-							display.setDownImage(lastCommand, ut->getFirstCtOfClass(cc)->getImage());
+
+                            if (cc == ccAttack && attackingUnit != NULL) {
+							    display.setDownImage(lastCommand, attackingUnit->getType()->getFirstCtOfClass(cc)->getImage());
+                            } else {
+							    display.setDownImage(lastCommand, ut->getFirstCtOfClass(cc)->getImage());
+                            }
 							display.setCommandClass(lastCommand, cc);
 							lastCommand++;
 						}
@@ -1195,6 +1218,7 @@ bool Gui::isSharedCommandClass(CommandClass commandClass){
     return true;
 }
 
+
 void Gui::computeSelected(bool doubleClick, bool force){
 	Selection::UnitContainer units;
 

source/glest_game/gui/selection.cpp

@@ -324,6 +324,16 @@ void Selection::removeUnitFromGroup(int groupIndex,int unitId) {
 	}
 }
 
+const Unit* Selection::getUnitFromCC(CommandClass commandClass){
+	const Unit *unit = NULL;
+	for(int i=0; i<(int)selectedUnits.size(); ++i){
+		const Unit *unit= selectedUnits[i];
+		const CommandType *ct= unit->getType()->getFirstCtOfClass(commandClass);
+		if(ct != NULL && ct->getClass()  == commandClass) return unit;
+	}
+	return unit;
+}
+
 //vector<Unit*> Selection::getUnitsForGroup(int groupIndex) {
 //	if(groupIndex < 0 || groupIndex >= maxGroups) {
 //		throw megaglest_runtime_error("Invalid value for groupIndex = " + intToStr(groupIndex));

source/glest_game/gui/selection.h

@@ -86,6 +86,7 @@ class Selection: public UnitObserver {
 	const Unit *getUnit(int i) const	{return selectedUnits[i];}
 	Unit *getUnitPtr(int i) 			{return selectedUnits[i];}
 	const Unit *getFrontUnit() const	{return selectedUnits.front();}
+	const Unit *getUnitFromCC(CommandClass commandClass);
 	Vec3f getRefPos() const;
 	bool hasUnit(const Unit* unit) const;
 

source/glest_game/menu/main_menu.cpp

@@ -227,6 +227,16 @@ void MainMenu::mouseDownLeft(int x, int y){
 	state->mouseClick(x, y, mbLeft);
 }
 
+void MainMenu::mouseDoubleClickLeft(int x, int y){
+	if(GraphicComponent::getFade()<0.2f) return;
+	state->mouseDoubleClick(x, y, mbLeft);
+}
+
+void MainMenu::mouseDoubleClickRight(int x, int y){
+	if(GraphicComponent::getFade()<0.2f) return;
+	state->mouseDoubleClick(x, y, mbRight);
+}
+
 void MainMenu::mouseDownRight(int x, int y){
 	if(GraphicComponent::getFade()<0.2f) return;
 	state->mouseClick(x, y, mbRight);

source/glest_game/menu/main_menu.h

@@ -74,6 +74,8 @@ class MainMenu: public ProgramState {
     virtual void mouseMove(int x, int y, const MouseState *mouseState);
     virtual void eventMouseWheel(int x, int y,int zDelta);
     virtual void mouseDownLeft(int x, int y);
+	virtual void mouseDoubleClickLeft(int x, int y);
+	virtual void mouseDoubleClickRight(int x, int y);
     virtual void mouseDownRight(int x, int y);
 	virtual void mouseUpLeft(int x, int y);
 	virtual bool textInput(std::string text);
@@ -119,6 +121,7 @@ class MenuState {
 	MenuState(Program *program, MainMenu *mainMenu, const string &stateName);
 	virtual ~MenuState();
 	virtual void mouseClick(int x, int y, MouseButton mouseButton)=0;
+	virtual void mouseDoubleClick(int x, int y, MouseButton mouseButton)=0;
 	virtual void mouseUp(int x, int y, const MouseButton mouseButton){};
 	virtual void mouseMove(int x, int y, const MouseState *mouseState)=0;
 	virtual void eventMouseWheel(int x, int y, int zDelta){};

source/glest_game/menu/menu_state_about.h

@@ -59,6 +59,7 @@ class MenuStateAbout: public MenuState{
 	virtual ~MenuStateAbout();
 
 	void mouseClick(int x, int y, MouseButton mouseButton);
+	void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
 	void mouseMove(int x, int y, const MouseState *mouseState);
 	void render();
 	virtual void keyDown(SDL_KeyboardEvent key);

source/glest_game/menu/menu_state_connected_game.h

@@ -266,6 +266,7 @@ class MenuStateConnectedGame: public MenuState, public FTPClientCallbackInterfac
 	virtual ~MenuStateConnectedGame();
 
 	void mouseClick(int x, int y, MouseButton mouseButton);
+	void mouseDoubleClick(int x, int y, MouseButton mouseButton){};
 	void mouseMove(int x, int y, const MouseState *mouseState);
 	void eventMouseWheel(int x, int y,int zDelta);
 	void render();